Pep8 Fixes