Tidied up SupplyReport.java