made code review changes