diff --git a/src/main/java/com/prowidesoftware/swift/io/parser/XMLParser.java b/src/main/java/com/prowidesoftware/swift/io/parser/XMLParser.java
index 991c196b..f0248ee2 100644
--- a/src/main/java/com/prowidesoftware/swift/io/parser/XMLParser.java
+++ b/src/main/java/com/prowidesoftware/swift/io/parser/XMLParser.java
@@ -19,18 +19,16 @@
 import com.prowidesoftware.swift.model.*;
 import com.prowidesoftware.swift.model.field.Field;
 import com.prowidesoftware.swift.utils.SafeXmlUtils;
+import java.io.ByteArrayInputStream;
+import java.nio.charset.StandardCharsets;
+import java.util.logging.Level;
+import javax.xml.parsers.DocumentBuilder;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.Validate;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
-import java.io.ByteArrayInputStream;
-import java.nio.charset.StandardCharsets;
-import java.util.logging.Level;
-
-import javax.xml.parsers.DocumentBuilder;
-
 /**
  * This is the main parser for WIFE's XML internal representation.<br>
  * The supported XML format is consider <i>internal</i> because it is an ad-hoc
diff --git a/src/main/java/com/prowidesoftware/swift/model/SwiftTagListBlock.java b/src/main/java/com/prowidesoftware/swift/model/SwiftTagListBlock.java
index 78af90e0..be8dafa5 100644
--- a/src/main/java/com/prowidesoftware/swift/model/SwiftTagListBlock.java
+++ b/src/main/java/com/prowidesoftware/swift/model/SwiftTagListBlock.java
@@ -21,14 +21,13 @@
 import com.prowidesoftware.swift.model.field.Field16R;
 import com.prowidesoftware.swift.model.field.Field16S;
 import com.prowidesoftware.swift.model.field.GenericField;
-import org.apache.commons.lang3.ArrayUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.Validate;
-
 import java.io.Serializable;
 import java.util.*;
 import java.util.logging.Level;
 import java.util.stream.Collectors;
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Validate;
 
 /**
  * Base class for SWIFT blocks that contain and arbitrary <b>set of fields</b> (3, 4, 5 and user blocks).<br>