updated dependencies
refactoring