#1 code review comment fixes.