Addressing some code review issues.