CrazySpawner: code cleanup