Activity 4 - Code simplification and adjustments

Classes:
- ReceiptController.java
- ReportController.java