Tidy to eliminate pep8 warnings