Cleanup spacing

Change-Id: Iec82344c45795d746dc54e6236bbaf21b3b1f817