CLSN-642 code review - Jun 30