Refactor roster.c