Refactor methods
Use self.current_player in game