fixed code review