Naming consistancy, flake8 compliance