diff --git a/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFSheet.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFSheet.java
index b30883966a..b8166a880e 100644
--- a/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFSheet.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFSheet.java
@@ -4644,7 +4644,7 @@ public class XSSFSheet extends POIXMLDocumentPart implements Sheet, OoxmlSheetEx
 
         StringBuilder rng = new StringBuilder();
         rng.append(c);
-        if(rng.length() > 0 && r.length() > 0) {
+        if(rng.length() > 0 && !r.isEmpty()) {
             rng.append(',');
         }
         rng.append(r);
diff --git a/poi-ooxml/src/main/java/org/apache/poi/xwpf/extractor/XWPFWordExtractor.java b/poi-ooxml/src/main/java/org/apache/poi/xwpf/extractor/XWPFWordExtractor.java
index 0673aee02d..3ef53d636a 100644
--- a/poi-ooxml/src/main/java/org/apache/poi/xwpf/extractor/XWPFWordExtractor.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xwpf/extractor/XWPFWordExtractor.java
@@ -144,13 +144,13 @@ public class XWPFWordExtractor implements POIXMLTextExtractor {
         // Add comments
         XWPFCommentsDecorator decorator = new XWPFCommentsDecorator(paragraph, null);
         String commentText = decorator.getCommentText();
-        if (commentText.length() > 0) {
+        if (!commentText.isEmpty()) {
             text.append(commentText).append('\n');
         }
 
         // Do endnotes and footnotes
         String footnameText = paragraph.getFootnoteText();
-        if (footnameText != null && footnameText.length() > 0) {
+        if (footnameText != null && !footnameText.isEmpty()) {
             text.append(footnameText).append('\n');
         }
 
diff --git a/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFRun.java b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFRun.java
index 6a3e80b994..9ce7e2f093 100644
--- a/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFRun.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFRun.java
@@ -112,7 +112,7 @@ public class XWPFRun implements ISDTContents, IRunElement, CharacterRun {
                 NodeList kids = t.getDomNode().getChildNodes();
                 for (int n = 0; n < kids.getLength(); n++) {
                     if (kids.item(n) instanceof Text) {
-                        if (text.length() > 0) {
+                        if (!text.isEmpty()) {
                             text.append("\n");
                         }
                         text.append(kids.item(n).getNodeValue());
@@ -148,7 +148,7 @@ public class XWPFRun implements ISDTContents, IRunElement, CharacterRun {
      */
     static void preserveSpaces(XmlString xs) {
         String text = xs.getStringValue();
-        if (text != null && text.length() >= 1
+        if (text != null && !text.isEmpty()
                 && (Character.isWhitespace(text.charAt(0)) || Character.isWhitespace(text.charAt(text.length()-1)))) {
             try (XmlCursor c = xs.newCursor()) {
                 c.toNextToken();