improve move-enum