Aggresive pep8 fixes