Refactor handleSuggestion