Whitespace cleanup.

Based on previous cleanup and code standardization: 
Tabs before code, spaces between code, no trailing whitespace.