More readable measure and code cleanup.