Refactoring, first steps in implementing League