refactoring of dependencies