CLN: bit of cleanup