Refactor PostMeasurements