refactoring roster