Addressed code review results.