Mustache processing refactor