CLSN-728 code review - jul 3rd