MustacheValue refactoring