Whitespace, coding style cleanup