Getting closer to PEP8 Compliant