Big cleanup, infer enemy type