Underscored the templates and a few lint fixes.