Reduce a couple timeout delays.
Formatting