Improve the track format