CFY-552 fix code review commnets