cleanup
some formatting
removed whitespace