Cleaned up a little in Player.