more refactoring of stadiums