taking out some small pep8 violations.