Addressed code review comments.