Cleaning up the photo service a little.