Refactoring of Player class