Fix track number and improve formatting