More improvements based on reviewers' comments