Make the code conform with PEP