Cleaned up measurment code.