Removing easy pep8 violations