more tidying up...
(#352)