refactor team listing