Fix/template formatting

Fixes some output formatting issues to better pass JSHint validation.