PEP-8 changes (lots)
PEP-8/pylint changes, score is now 9.17/10