Minor Game/Controller simplification