Cleaning up to make pep8 happy