Tidy code and comments re #7396

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