Small formatting improvements

Change-Id: I6b10b6ce969948a6850f1658233adf7efba3b3ae