Fixed a number of pep8 violations