Taking out pep8 violations