Refactoring game controllers, phase 1