Cleanup for spaces and Tabs and overall formatting changes.