Further cleaning up of report interface