Code now follows PEP8 rules