Refactoring
Game Working