Refactoring of the dependency analyzer code