removes switch on type from current_player_message, and cleans up some other things regarding this method