Cosmetics

How can it be so hard to adhere to uniform spacing inside one source
file?

Change-Id: I582791b244dd83543143b84c3742ab4eba5251c0