whitespace cleanup
More whitespace and general formatting cleanup