Fixed pep8 issues as possible