Fixup minor style issues

Add braces

Remove commented debug statements

Change-Id: Ib2de5c28bb2a4fa15f585bd3b4d664f9ebfbaa86