Refactoring. Making a custom analyzer.