Remove extra spaces

Remove extra spaces

This changes the style of format to no longer line up variables in
a pretty layout by using extra spaces.
Note: This will change some of the indenting.