Small cleanup

Renamed some functions and variables and removed some code from
gamestate.