refactor demoAnalyzer