refactoring, adding deps