refactor keywords