CLSN-1680 code review