Update formatting

Reduces PHP CodeSniffer warnings.

Change-Id: If42cef712e5242f39cec3f907934dfd7f6ea1109