Code now more PEP-8 compliant