fixed code review changes