refactor Dependencies