cleanup and add ThingML evaluation