Updating route order, simplifying the destination
Using song.Song more appropriately