Some refurbishment in the player related classes