Fixed pep8 conflicts