Merge "gn2bp: Refactor and code clean up"