Taking out the last of the pep8 violations in main code