Refactoring team list for easy viewing