Refactoring dependecies.