Tabs and whitespace clean up