Really minor optimizations

- Grouped variables in GameController more