Minor fixup
Refactor redemption code