Some code review changes