cleaned up game controller