Trying to clean up and simplify payment options