Addressing PR feedback

Author: yogeshmo

articles/communication-services/quickstarts/email/includes/send-email-java.md

@@ -101,13 +101,12 @@ public class App
 }
 ```
 
-## [Sync Client](#tab/sync-client)
-
-## Creating the email client with authentication
-
+### Creating the email client with authentication
 There are a few different options available for authenticating an email client.
 
-#### Connection String
+#### [Connection String](#tab/connection-string)
+
+#### Sync Client
 
 To authenticate a client, you instantiate an `EmailClient` with your connection string. Learn how to [manage your resource's connection string](../../create-communication-resource.md#store-your-connection-string). You can also initialize the client with any custom HTTP client that implements the `com.azure.core.http.HttpClient` interface.
 
@@ -122,9 +121,26 @@ EmailClient emailClient = new EmailClientBuilder()
     .buildClient();
 ```
 
+#### Async Client
+
+To authenticate a client, you instantiate an `EmailAsyncClient` with your connection string. Learn how to [manage your resource's connection string](../../create-communication-resource.md#store-your-connection-string). You can also initialize the client with any custom HTTP client that implements the `com.azure.core.http.HttpClient` interface.
+
+To instantiate a client, add the following code to the `main` method:
+
+```java
+// You can get your connection string from your resource in the Azure portal.
+String connectionString = "endpoint=https://<resource-name>.communication.azure.com/;accesskey=<access-key>";
+
+EmailAsyncClient emailClient = new EmailClientBuilder()
+    .connectionString(connectionString)
+    .buildAsyncClient();
+```
+
 <a name='azure-active-directory'></a>
 
-#### Microsoft Entra ID
+#### [Microsoft Entra ID](#tab/entra-id)
+
+#### Sync Client
 
 A [DefaultAzureCredential](https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/identity/azure-identity#defaultazurecredential) object must be passed to the `EmailClientBuilder` via the `credential()` method. An endpoint must also be set via the `endpoint()` method.
 
@@ -139,8 +155,24 @@ EmailClient emailClient = new EmailClientBuilder()
     .buildClient();
 ```
 
-#### AzureKeyCredential
+#### Async Client
+
+A [DefaultAzureCredential](https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/identity/azure-identity#defaultazurecredential) object must be passed to the `EmailClientBuilder` via the `credential()` method. An endpoint must also be set via the `endpoint()` method.
+
+The `AZURE_CLIENT_SECRET`, `AZURE_CLIENT_ID`, and `AZURE_TENANT_ID` environment variables are needed to create a `DefaultAzureCredential` object.
 
+```java
+// You can find your endpoint and access key from your resource in the Azure portal
+String endpoint = "https://<resource-name>.communication.azure.com/";
+EmailAsyncClient emailClient = new EmailClientBuilder()
+    .endpoint(endpoint)
+    .credential(new DefaultAzureCredentialBuilder().build())
+    .buildAsyncClient();
+```
+
+#### [AzureKeyCredential](#tab/azure-key-credential)
+
+#### Sync Client
 Email clients can also be created and authenticated using the endpoint and Azure Key Credential acquired from an Azure Communication Resource in the [Azure portal](https://portal.azure.com/).
 
 ```java
@@ -152,7 +184,21 @@ EmailClient emailClient = new EmailClientBuilder()
     .buildClient();
 ```
 
+#### Async Client
+
+Email clients can also be created and authenticated using the endpoint and Azure Key Credential acquired from an Azure Communication Resource in the [Azure portal](https://portal.azure.com/).
+
+```java
+String endpoint = "https://<resource-name>.communication.azure.com";
+AzureKeyCredential azureKeyCredential = new AzureKeyCredential("<access-key>");
+EmailAsyncClient emailClient = new EmailClientBuilder()
+    .endpoint(endpoint)
+    .credential(azureKeyCredential)
+    .buildAsyncClient();
+```
+
 For simplicity, this quickstart uses connection strings, but in production environments, we recommend using [service principals](../../../quickstarts/identity/service-principal.md).
+---
 
 ## Basic email sending 
 
@@ -172,18 +218,21 @@ Make these replacements in the code:
 
 To send the email message, call the `beginSend` function from the `EmailClient`.
 
+## [Sync Client](#tab/sync-client)
+
 Calling `beginSend` on the sync client returns a `SyncPoller` object, which can be used to check on the status of the operation and retrieve the result once it's finished. Note that the initial request to send an email will be sent as soon as the `beginSend` method is called. Sending an email is a long running operation, so calling `getFinalResult` on the poller returned by `beginSend` could potentially block the application for a long time. The recommended method is to do manual polling at an interval that's appropriate for your application needs as demonstrated in the sample below.
 
 ```java
 try
 {
-    SyncPoller<EmailSendResult, EmailSendResult> poller = emailClient.beginSend(message, null);
+    SyncPoller<EmailSendResult, EmailSendResult> poller = emailClient.beginSend(message, null); // This will send out the initial request to send an email
 
     PollResponse<EmailSendResult> pollResponse = null;
 
     Duration timeElapsed = Duration.ofSeconds(0);
     Duration POLLER_WAIT_TIME = Duration.ofSeconds(10);
 
+    // Polling is done manually to avoid blocking the application in case of an error
     while (pollResponse == null
             || pollResponse.getStatus() == LongRunningOperationStatus.NOT_STARTED
             || pollResponse.getStatus() == LongRunningOperationStatus.IN_PROGRESS)
@@ -217,78 +266,12 @@ catch (Exception exception)
 
 ## [Async Client](#tab/async-client)
 
-## Creating the email client with authentication
-
-The Azure SDK for Java also contains non-blocking, asynchronous APIs for interacting with Azure services.
-
-#### Connection String
-
-To authenticate a client, you instantiate an `EmailAsyncClient` with your connection string. Learn how to [manage your resource's connection string](../../create-communication-resource.md#store-your-connection-string). You can also initialize the client with any custom HTTP client that implements the `com.azure.core.http.HttpClient` interface.
-
-To instantiate a client, add the following code to the `main` method:
-
-```java
-// You can get your connection string from your resource in the Azure portal.
-String connectionString = "endpoint=https://<resource-name>.communication.azure.com/;accesskey=<access-key>";
-
-EmailAsyncClient emailClient = new EmailClientBuilder()
-    .connectionString(connectionString)
-    .buildAsyncClient();
-```
-
-<a name='azure-active-directory'></a>
-
-#### Microsoft Entra ID
-
-A [DefaultAzureCredential](https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/identity/azure-identity#defaultazurecredential) object must be passed to the `EmailClientBuilder` via the `credential()` method. An endpoint must also be set via the `endpoint()` method.
-
-The `AZURE_CLIENT_SECRET`, `AZURE_CLIENT_ID`, and `AZURE_TENANT_ID` environment variables are needed to create a `DefaultAzureCredential` object.
-
-```java
-// You can find your endpoint and access key from your resource in the Azure portal
-String endpoint = "https://<resource-name>.communication.azure.com/";
-EmailAsyncClient emailClient = new EmailClientBuilder()
-    .endpoint(endpoint)
-    .credential(new DefaultAzureCredentialBuilder().build())
-    .buildAsyncClient();
-```
-
-#### AzureKeyCredential
-
-Email clients can also be created and authenticated using the endpoint and Azure Key Credential acquired from an Azure Communication Resource in the [Azure portal](https://portal.azure.com/).
-
-```java
-String endpoint = "https://<resource-name>.communication.azure.com";
-AzureKeyCredential azureKeyCredential = new AzureKeyCredential("<access-key>");
-EmailAsyncClient emailClient = new EmailClientBuilder()
-    .endpoint(endpoint)
-    .credential(azureKeyCredential)
-    .buildAsyncClient();
-```
-
-For simplicity, this quickstart uses connection strings, but in production environments, we recommend using [service principals](../../../quickstarts/identity/service-principal.md).
-
 ## Basic email sending 
 
-An email message can be crafted using the `EmailMessage` object in the SDK.
-
-```java
-EmailMessage message = new EmailMessage()
-    .setSenderAddress("<[email protected]>")
-    .setToRecipients("<[email protected]>")
-    .setSubject("Welcome to Azure Communication Services Email")
-    .setBodyPlainText("This email message is sent from Azure Communication Services Email using the Java SDK.");
-```
-
-Make these replacements in the code:
-- Replace `<[email protected]>` with the email address you would like to send a message to.
-- Replace `<[email protected]>` with the MailFrom address of your verified domain.
-
-To send the email message, call the `beginSend` function from the `EmailAsyncClient`.
-
 Calling `beginSend` on the async client returns a `PollerFlux` object to which you can subscribe. You will want to set up the subscriber in a seperate process to take advantage of the asynchronous functionality. Note that the initial request to send an email will not be sent until a subscriber is set up.
 
 ```java
+// The initial request is sent out as soon as we subscribe the to PollerFlux object
 emailClient.beginSend(emailMessage).subscribe(
         response -> {
             if (response.getStatus() == LongRunningOperationStatus.SUCCESSFULLY_COMPLETED) {