cleaned up player.rb