Little cleaning + better last.fm connection flow