Made readability changes to Player