Cleaup discogs; convert into helper framework