diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/segmentation/SectionsBuilderService.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/segmentation/SectionsBuilderService.java
index 02fb84d0..504870ef 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/segmentation/SectionsBuilderService.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/segmentation/SectionsBuilderService.java
@@ -38,7 +38,6 @@ public class SectionsBuilderService {
                 current.setPage(page.getPageNumber());
 
                 if (prev != null && current.getClassification().startsWith("H ") || !document.isHeadlines()) {
-
                     Paragraph chunkBlock = buildTextBlock(chunkWords, lastHeadline, previousTable);
                     chunkBlock.setHeadline(lastHeadline);
                     lastHeadline = current.getText();
@@ -85,11 +84,10 @@ public class SectionsBuilderService {
                     table.setHeadline("Table in: " + lastHeadline);
                 }
                 // Distribute header information for subsequent tables
-                if (previousTable != null && hasInvalidHeaderInformation(table) && hasValidHeaderInformation(previousTable)) {
-                    if ((previousTable.isVerticalHeader() && previousTable.getRowCount() == table.getRowCount()) || previousTable
-                            .getColCount() == table.getColCount()) {
-                        table.setHeaders(previousTable.getHeaders());
-                    }
+                if (previousTable != null && hasInvalidHeaderInformation(table) && hasValidHeaderInformation(previousTable) &&
+                        (previousTable.isVerticalHeader() && previousTable.getRowCount() == table.getRowCount() ||
+                                previousTable.getColCount() == table.getColCount())) {
+                    table.setHeaders(previousTable.getHeaders());
                 }
 
                 if (textBlock != null && !alreadyAdded) {
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/tableextraction/model/Table.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/tableextraction/model/Table.java
index e32e58c1..ef85c0e8 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/tableextraction/model/Table.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/tableextraction/model/Table.java
@@ -82,11 +82,10 @@ public class Table extends AbstractTextContainer {
         boolean allBold = true;
         List<Cell> rowCells = rows.get(0);
         for (Cell cell : rowCells) {
-            if (CollectionUtils.isNotEmpty(cell.getTextBlocks())) {
-                if (!cell.getTextBlocks().get(0).getMostPopularWordStyle().equals("bold")) {
-                    allBold = false;
-                    break;
-                }
+            if (CollectionUtils.isNotEmpty(cell.getTextBlocks()) &&
+                    !cell.getTextBlocks().get(0).getMostPopularWordStyle().equals("bold")) {
+                allBold = false;
+                break;
             }
         }
         if (!allBold) {
@@ -94,11 +93,10 @@ public class Table extends AbstractTextContainer {
             List<Cell> firstColCells = new ArrayList<>();
             for (List<Cell> row : rows) {
                 Cell firstInRow = row.get(0);
-                if (CollectionUtils.isNotEmpty(firstInRow.getTextBlocks())) {
-                    if (!firstInRow.getTextBlocks().get(0).getMostPopularWordStyle().equals("bold")) {
-                        allBold = false;
-                        break;
-                    }
+                if (CollectionUtils.isNotEmpty(firstInRow.getTextBlocks()) &&
+                        !firstInRow.getTextBlocks().get(0).getMostPopularWordStyle().equals("bold")) {
+                    allBold = false;
+                    break;
                 }
                 firstColCells.add(firstInRow);
             }