DAR-309

Code review changes:
- newlines at EOF
- removed abstraction unnecessary at this point
- removed accidental newline added to MustacheService