fix code review findings