refactoring, including league class
refactoring
remove old methods
changes for new version
changes for new version