Making all things pep8 compliant