PEP8 enhancements