Code tidying in Model\Tracks.php