Refactor, better naming.
WIP receipt recover