Tidy up for pep8