change to game_state imports and pep8 cleanup