Refactored and renamed the Player class