Started doing some Pep8 work