CLN: minor cleanup