Refactored teams list