Refactor: Generic payments to checkout

?