Refactored away RoundRobin class