Pythonic Payment refactoring #10