Refactoring of AlbumController