Whitespace cleanup and problem 35