Removing pep8 violations