Code cleanup, handle pls format from Mopidy