Cleanup (tabs-2-spaces, PEP8, correct typos)