Code review tweaks.  Added _ and timing.