a couple of code review changes