diff --git a/src/main/java/org/calypsonet/tool/calypso/card/Tool_AnalyzeCardFileStructure.java b/src/main/java/org/calypsonet/tool/calypso/card/Tool_AnalyzeCardFileStructure.java
index d25754c..eaa03d1 100644
--- a/src/main/java/org/calypsonet/tool/calypso/card/Tool_AnalyzeCardFileStructure.java
+++ b/src/main/java/org/calypsonet/tool/calypso/card/Tool_AnalyzeCardFileStructure.java
@@ -107,7 +107,7 @@ private static CardFileData getFileData(ElementaryFile selectedFile, CalypsoCard
             .processCommands(ChannelControl.KEEP_OPEN);
 
         fileData
-            .getRecordData()
+            .getRecordDataList()
             .add((new RecordData(i + 1, selectedFile.getData().getContent((i + 1)))));
       }
     }
diff --git a/src/main/java/org/calypsonet/tool/calypso/carddata/CardFileData.java b/src/main/java/org/calypsonet/tool/calypso/carddata/CardFileData.java
index ba77188..e50b49e 100644
--- a/src/main/java/org/calypsonet/tool/calypso/carddata/CardFileData.java
+++ b/src/main/java/org/calypsonet/tool/calypso/carddata/CardFileData.java
@@ -43,7 +43,7 @@ public class CardFileData {
 
   private final AccessConditions accessConditions;
 
-  private final List<RecordData> recordData;
+  private final List<RecordData> recordDataList;
 
   public CardFileData(ElementaryFile fileInfo) {
 
@@ -67,7 +67,7 @@ public CardFileData(ElementaryFile fileInfo) {
         new AccessConditions(
             fileInfo.getHeader().getAccessConditions(), fileInfo.getHeader().getKeyIndexes());
 
-    recordData = new ArrayList<>();
+    recordDataList = new ArrayList<>();
 
     ref = HexUtil.toHex(fileInfo.getHeader().getSharedReference());
   }
@@ -108,8 +108,8 @@ public String getDataRef() {
     return ref;
   }
 
-  public List<RecordData> getRecordData() {
-    return recordData;
+  public List<RecordData> getRecordDataList() {
+    return recordDataList;
   }
 
   public void print(Logger logger) {
@@ -148,11 +148,10 @@ public void print(Logger logger) {
         group3,
         this.getDataRef());
 
-    for (int i = 0; this.getRecordData() != null && i < this.getRecordData().size(); i++) {
-      logger.info(
-          "+ #{}:{}",
-          this.getRecordData().get(i).getIndex(),
-          HexUtil.toHex(this.getRecordData().get(i).getValue()));
+    if (getRecordDataList() != null) {
+      for (RecordData recordData : getRecordDataList()) {
+        logger.info("+ #{}:{}", recordData.getIndex(), HexUtil.toHex(recordData.getValue()));
+      }
     }
   }
 }
diff --git a/src/main/java/org/calypsonet/tool/calypso/carddata/CardStructureData.java b/src/main/java/org/calypsonet/tool/calypso/carddata/CardStructureData.java
index 420afcc..f85a6eb 100644
--- a/src/main/java/org/calypsonet/tool/calypso/carddata/CardStructureData.java
+++ b/src/main/java/org/calypsonet/tool/calypso/carddata/CardStructureData.java
@@ -49,7 +49,7 @@ public CardStructureData(
 
     infos = softwareInfo;
 
-    date = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss").format(new Date(creationDate.getTime()));
+    date = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss").format(creationDate);
 
     version = softwareVersion;