Addressed more CR feedback.