improve KEvoree Model Source generation
cleanup