Refactoring of Player and Track classes