esport refactoring