Small code review changes