Whitespace cleanup

Just some minor tweaks avoid extra whitespace in the generated ERB templates.