Whitespace cleanup

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