whitespace cleanup and formatting changes