Some refactoring around players and dreamteams (may need more work)