Fix pep8 better