refactoring analyzer class