Preparing for refactoring of comparative analysis code