diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFRow.java b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFRow.java
index 480f7b789..d6a98dd3a 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFRow.java
+++ b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFRow.java
@@ -113,7 +113,7 @@ public class XSSFRow implements Row, Comparable<XSSFRow> {
      */
     @Override
     @SuppressWarnings("unchecked")
-	public Iterator<Cell> cellIterator() {
+    public Iterator<Cell> cellIterator() {
         return (Iterator<Cell>)(Iterator<? extends Cell>)_cells.values().iterator();
     }
 
@@ -129,7 +129,7 @@ public class XSSFRow implements Row, Comparable<XSSFRow> {
      */
     @Override
     public Iterator<Cell> iterator() {
-    	return cellIterator();
+        return cellIterator();
     }
 
     /**
@@ -236,7 +236,7 @@ public class XSSFRow implements Row, Comparable<XSSFRow> {
      */
     @Override
     public XSSFCell getCell(int cellnum) {
-    	return getCell(cellnum, _sheet.getWorkbook().getMissingCellPolicy());
+        return getCell(cellnum, _sheet.getWorkbook().getMissingCellPolicy());
     }
 
     /**
@@ -247,10 +247,10 @@ public class XSSFRow implements Row, Comparable<XSSFRow> {
      */
     @Override
     public XSSFCell getCell(int cellnum, MissingCellPolicy policy) {
-    	if(cellnum < 0) throw new IllegalArgumentException("Cell index must be >= 0");
+        if(cellnum < 0) throw new IllegalArgumentException("Cell index must be >= 0");
 
         // Performance optimization for bug 57840: explicit boxing is slightly faster than auto-unboxing, though may use more memory
-    	final Integer colI = Integer.valueOf(cellnum); // NOSONAR
+        final Integer colI = Integer.valueOf(cellnum); // NOSONAR
         XSSFCell cell = _cells.get(colI);
         switch (policy) {
             case RETURN_NULL_AND_BLANK:
@@ -273,7 +273,7 @@ public class XSSFRow implements Row, Comparable<XSSFRow> {
      */
     @Override
     public short getFirstCellNum() {
-    	return (short)(_cells.size() == 0 ? -1 : _cells.firstKey());
+        return (short)(_cells.size() == 0 ? -1 : _cells.firstKey());
     }
 
     /**
@@ -297,7 +297,7 @@ public class XSSFRow implements Row, Comparable<XSSFRow> {
      */
     @Override
     public short getLastCellNum() {
-    	return (short)(_cells.size() == 0 ? -1 : (_cells.lastKey() + 1));
+        return (short)(_cells.size() == 0 ? -1 : (_cells.lastKey() + 1));
     }
 
     /**
@@ -350,7 +350,7 @@ public class XSSFRow implements Row, Comparable<XSSFRow> {
      */
     @Override
     public void setHeightInPoints(float height) {
-	    setHeight((short)(height == -1 ? -1 : (height*20)));
+        setHeight((short)(height == -1 ? -1 : (height*20)));
     }
 
     /**
@@ -361,7 +361,7 @@ public class XSSFRow implements Row, Comparable<XSSFRow> {
      */
     @Override
     public int getPhysicalNumberOfCells() {
-    	return _cells.size();
+        return _cells.size();
     }
 
     /**
@@ -397,7 +397,7 @@ public class XSSFRow implements Row, Comparable<XSSFRow> {
      */
     @Override
     public boolean getZeroHeight() {
-    	return this._row.getHidden();
+        return this._row.getHidden();
     }
 
     /**
@@ -407,7 +407,7 @@ public class XSSFRow implements Row, Comparable<XSSFRow> {
      */
     @Override
     public void setZeroHeight(boolean height) {
-    	this._row.setHidden(height);
+        this._row.setHidden(height);
 
     }
 
@@ -491,7 +491,7 @@ public class XSSFRow implements Row, Comparable<XSSFRow> {
      */
     @Internal
     public CTRow getCTRow(){
-    	return _row;
+        return _row;
     }
 
     /**