album code refactoring