Refactoring, updated dependencies