mod - some refactor around the photo ref processing