Make default job timeout 6000 secs. Clean up a bit of code.