Game controller refactoring