Code style improvement
forEach converted to for in.
Collapsing new annotation restored.

And other pull request feedback fixes.