mustache clean up