Player Decorator classes refactoring