Updates per review #22

Optimization for time calculations.