Improve wording as suggested by STL