refactor some grammer