No need for mustache object anymore and simpler comments handling