Refactored analyzer