Move to PEP 8 compliant code