WIP more pep8