CLN: tidy up a few things