Import discovery instead of build for readability & fix comment