Tabs and PEP8 fixes