album management refactoring