address all but one code review issue