Refactored album app