Refactoring, game works!