fixing code review changes