Cleanup and added a new payment method