Making some changes as reviewers asked