Refactor setting the default wait time