Codestyle and wording fixes.
Codestyle fixes
updated dependencies