Subtle improvement
Simplify some computations