Cleaned up some in Player.