Clean up code for Pep8 check, run that automatically