Clean up Player.js. #616