First pass of pep8 changes