Revert "fix golden output"

This reverts commit 426a14c3af00cf11229b129da0f9e2d04b1f5381.
implement easy loop variables
make line breaks in comments consistent with jinja