Refactored a couple of things in Player