Feature/pep8