Refactoring, attempt to reset the game
Merging