clean up waitFor async style