Tabs --> spaces plus cleanup