Cleaned up using pep8