Taking out minor pep8 violations