Tabs to spaces and other minor changes