whitespace cleanup + source formatting