PEP8 compliant changes added.