Refactor round robin index updating