Python POC: More refactoring and more comments