reformat
merged changes from spotydl