Sort the team members programatically
Remove some commented code