Resolve all pep8 issues