refactoring using Album object instead of Dictionary