Some code simplifications.
Upgraded dependencies.