Quite a bit of refactoring. New SuggesterAnalyzer class