fix issues per code review