Format/cleanup.
Increase timeout.