Lots of whitespace updates on this file :-1:  :(