Further rubocop fixes along with a large refactoring of how we calculate the best team, should fit better into custom team descriptions later on