My Leagues and more refactoring