JAL-1424 slight tidying of reporting