improve wording to be according with current code