Fix ommited dependency and style
Style fix
Small updates and style fixes.
Update dependencies.