Another tidy up of report structure