Few tweaks to payment mechanic. Added support for variables and made the
code neater.