Addressed more code review comments.