refactoring + dependency version update