Refactoring of the analysis