Resolved tox/pep8 errors