Refactor albums method