photo archiver code cleanup; comprehensions!