Tabs/spaces refactor