set dial timeout to 30s
minor cleanup