Address code review issues.