Minor re-photography refactor