refactor with multiple errors and album list vs album contents
Merge pull request #5 from mark-thomas/refactor

refactor with multiple errors and album list vs album contents