PEP-8 Improvements