cleanup
a lot of whitespace and some documentation