diff --git a/platform/util/src/com/intellij/util/io/PersistentEnumeratorBase.java b/platform/util/src/com/intellij/util/io/PersistentEnumeratorBase.java
index 0b2a2103762a..7171af3788e6 100644
--- a/platform/util/src/com/intellij/util/io/PersistentEnumeratorBase.java
+++ b/platform/util/src/com/intellij/util/io/PersistentEnumeratorBase.java
@@ -46,24 +46,23 @@ public abstract class PersistentEnumeratorBase<Data> implements Forceable, Close
 
   private static final int META_DATA_OFFSET = 4;
   protected static final int DATA_START = META_DATA_OFFSET + 16;
+  private static final CacheKey ourFlyweight = new FlyweightKey();
 
   protected final ResizeableMappedFile myStorage;
   private final boolean myAssumeDifferentSerializedBytesMeansObjectsInequality;
   private final AppendableStorageBackedByResizableMappedFile myKeyStorage;
+  protected final KeyDescriptor<Data> myDataDescriptor;
+  protected final File myFile;
+  private final Version myVersion;
+  private final boolean myDoCaching;
+
+  private volatile boolean myDirtyStatusUpdateInProgress;
 
   private boolean myClosed = false;
   private boolean myDirty = false;
-  protected final KeyDescriptor<Data> myDataDescriptor;
-
-  private static final CacheKey ourFlyweight = new FlyweightKey();
-
-  protected final File myFile;
   private boolean myCorrupted = false;
-  private final Version myVersion;
   private RecordBufferHandler<PersistentEnumeratorBase> myRecordHandler;
-  private volatile boolean myDirtyStatusUpdateInProgress;
   private Flushable myMarkCleanCallback;
-  private final boolean myDoCaching;
 
   public static class Version {
     private final int correctlyClosedMagic;