Update default timeouts, more readable code