analysis refactoring.