Update receipt based on Aleksej code review