Cleaned up roulette termination