Formatting changes.
Add timing code back in.