Fix the track is sometimes a mess, or, intertwined
Improve code readability
Improve tutorial readability