GameManager Refactoring

Make the code a bit nicer