Whitespace, coding style cleanup
Whitespace, coding style cleanup