Tidying up game controller
Removing reference to global app state