Refactor Game further, mercilessly