Don't capture the payment in the clean method and other minor changes