DataAnalyzer + refactoring