Improve wording and add comment as of STL's suggestions