CLN refactor once over