Fixed all pep8, flake8 issues but one