Update dependencies
Code improvements