Improve pep8