PEP8 Improvements