Code style updates

Some minor changes according to Nikerabbit's comments.

Change-Id: I8e266fb9ad3743d401c01cb543546e207197bda9