main: Use switch to simplify logic
game-grid: Clean up