Another save before refactoring. Changing DataAnalyzer to non-static