CLSN-727 code review - jul 3rd