Tabs to space and identation fixes