PEP 8 compliant corrections