Cleans up payment & billing modules for issues #183 & #291

Cleans up payment & billing modules for issues #183 & #291