Refactor deps