Update result calculations for consistency