PEP 8 convenience and clean up