Made objective value calculator more concise.