Additional cleanup

Whitespace cleanup