Refactoring GameManager class
Renaming