Activity 4 - Code simplification and adjustments

GenerateReceipt
NewDoneService