Payment tool cleanup
Merge pull request #2 from nabinhait/paytool

Payment tool cleanup
Fixed conflict