cleaned up album controller.