Whitespace cleanup

As requested