Refactor more logic into AlbumCreator