Taking out some pep8 violations