Moving to var-each
Fixing more style errors