Code adapted to PEP-8