Tidy up code improve comments re #7617

Signed-off-by: Karl Palmen <karl.palmen@stfc.ac.uk>