refactor Analyzer