small code review changes