Round Robin Module Cleaned Up