Slight refacting to how track list is declared