Clean up to make pep8 happy