Fix some code standards issues
Closes #83 - move towards more modular payment method handling
Create new version