Tabs not spaces and general code formatting clean up