Update dependencies.
Improve code due to coding style.