clean up whitespace def a bit
more cleanup