Taking out some easy pep8 violations