Refactoring player