Beautify Mustache template vars
Update documentation