PEP 8 enhancements