Last PEP8 before refactoring