Code formatting fixes

Stylized.
Follow up Ic8ffb0d9759338617a92ad171a87652aaca6ccb6

Change-Id: I0db5f0eb4ba097882f9a620c3d32e8e9a7a9c2b5