Cleaning up.  pep8, etc.