Remove useless class result and fix match.

Also display a better team name.