PEP 8 compliant changes