diff --git a/bigtable-client-core-parent/bigtable-client-core/src/main/java/com/google/cloud/bigtable/core/IBigtableDataClient.java b/bigtable-client-core-parent/bigtable-client-core/src/main/java/com/google/cloud/bigtable/core/IBigtableDataClient.java
index 4c03e0b7e6..d952330ca7 100644
--- a/bigtable-client-core-parent/bigtable-client-core/src/main/java/com/google/cloud/bigtable/core/IBigtableDataClient.java
+++ b/bigtable-client-core-parent/bigtable-client-core/src/main/java/com/google/cloud/bigtable/core/IBigtableDataClient.java
@@ -32,8 +32,8 @@ public interface IBigtableDataClient {
    * Mutate a row atomically.
    *
    * @param rowMutation a {@link RowMutation} model object.
-   * @throws ExecutionException
-   * @throws InterruptedException
+   * @throws ExecutionException if any.
+   * @throws InterruptedException if any.
    */
   void mutateRow(RowMutation rowMutation) throws ExecutionException, InterruptedException;
 
@@ -41,8 +41,9 @@ public interface IBigtableDataClient {
    * Mutate a row atomically.
    *
    * @param rowMutation a {@link RowMutation} model object.
-   * @return ApiFuture</Void> returns api future.
-   * @throws InterruptedException
+   * @return a {@link ApiFuture} of type {@link Void} will be set when request is
+   *     successful otherwise exception will be thrown.
+   * @throws InterruptedException if any.
    */
   ApiFuture<Void> mutateRowAsync(RowMutation rowMutation) throws InterruptedException;
 
@@ -51,8 +52,8 @@ public interface IBigtableDataClient {
    *
    * @param readModifyWriteRow a {@link ReadModifyWriteRow} model object.
    * @return Row a modified row.
-   * @throws ExecutionException
-   * @throws InterruptedException
+   * @throws ExecutionException if any.
+   * @throws InterruptedException if any.
    */
   Row readModifyWriteRow(ReadModifyWriteRow readModifyWriteRow)
       throws ExecutionException, InterruptedException;
@@ -61,8 +62,9 @@ Row readModifyWriteRow(ReadModifyWriteRow readModifyWriteRow)
    * Perform an atomic read-modify-write operation on a row.
    *
    * @param readModifyWriteRow a {@link ReadModifyWriteRow} model object.
-   * @return ApiFuture<Row> returns future.
-   * @throws InterruptedException
+   * @return a {@link ApiFuture} of type {@link Row} will be set when request is
+   *     successful otherwise exception will be thrown.
+   * @throws InterruptedException if any.
    */
   ApiFuture<Row> readModifyWriteRowAsync(ReadModifyWriteRow readModifyWriteRow) throws InterruptedException;
 
@@ -75,7 +77,8 @@ Row readModifyWriteRow(ReadModifyWriteRow readModifyWriteRow)
    * Mutate a row atomically dependent on a precondition.
    *
    * @param conditionalRowMutation a {@link ConditionalRowMutation} model object.
-   * @return ApiFuture<Boolean> returns api future.
+   * @return a {@link ApiFuture} of type {@link Boolean} will be set when request is
+   *     successful otherwise exception will be thrown.
    */
   ApiFuture<Boolean> checkAndMutateRowAsync(ConditionalRowMutation conditionalRowMutation);
 
@@ -84,8 +87,8 @@ Row readModifyWriteRow(ReadModifyWriteRow readModifyWriteRow)
    *
    * @param conditionalRowMutation a {@link ConditionalRowMutation} model object.
    * @return Boolean returns true if predicate returns any result.
-   * @throws ExecutionException
-   * @throws InterruptedException
+   * @throws ExecutionException if any.
+   * @throws InterruptedException if any.
    */
   Boolean checkAndMutateRow(ConditionalRowMutation conditionalRowMutation)
       throws ExecutionException, InterruptedException;
diff --git a/bigtable-client-core-parent/bigtable-client-core/src/main/java/com/google/cloud/bigtable/core/IBulkMutation.java b/bigtable-client-core-parent/bigtable-client-core/src/main/java/com/google/cloud/bigtable/core/IBulkMutation.java
index 49cf2f1c7e..476cc4be3b 100644
--- a/bigtable-client-core-parent/bigtable-client-core/src/main/java/com/google/cloud/bigtable/core/IBulkMutation.java
+++ b/bigtable-client-core-parent/bigtable-client-core/src/main/java/com/google/cloud/bigtable/core/IBulkMutation.java
@@ -45,8 +45,8 @@ public interface IBulkMutation {
    * mechanism.
    *
    * @param rowMutation The {@link com.google.cloud.bigtable.data.v2.models.RowMutation} to add
-   * @return a {@link com.google.common.util.concurrent.SettableFuture} will be set when request is
-   * successful otherwise exception will be thrown.
+   * @return a {@link ApiFuture} of type {@link Void} will be set when request is
+   *     successful otherwise exception will be thrown.
    */
   ApiFuture<Void> add(RowMutation rowMutation);
 }