I like that this is simpler.  I think I originally broke it out into two steps to make the calculation very explicit.