Some PEP-8 Cleanup