Code quality fixes
Code quality fixes make it more PEP8 compliant