Improve wording as per AMC comments