Refactor redemption code
Merge branch 'component'