sort albums fix; cleaning code