Fixes to code style

Change-Id: Idd204a3b49cc56d297b4bad36de60b4ac0ff21d9