refactor suggester