Various code review changes