Cleanup: PEP8
Cleanup: coding style fixes
Don't polute the global namespace