Upgrade dependencies.
Comment updates and whitespace fixes.
Refactor to use forEach.