Improve Payment execution code