Refactored JSAnalyzer