code review changes implemented