mustache support + cleanup