Refactoring player object