minor clean up
minor RoundRobin improvements