Tabs to spaces, variable name changes