diff --git a/python/src/com/jetbrains/python/debugger/containerview/PyDataViewerPanel.kt b/python/src/com/jetbrains/python/debugger/containerview/PyDataViewerPanel.kt
index c998e26b93bf..09c30bb7948a 100644
--- a/python/src/com/jetbrains/python/debugger/containerview/PyDataViewerPanel.kt
+++ b/python/src/com/jetbrains/python/debugger/containerview/PyDataViewerPanel.kt
@@ -190,7 +190,7 @@ open class PyDataViewerPanel(@JvmField protected val project: Project, val frame
     }
 
     if (!modifier) {
-      PyDataViewerCollector.slicingApplied.log()
+      PyDataViewerCollector.SLICING_APPLIED_EVENT.log()
     }
   }
 
diff --git a/python/src/com/jetbrains/python/debugger/statistics/PyDataViewerCollector.kt b/python/src/com/jetbrains/python/debugger/statistics/PyDataViewerCollector.kt
index cc35af895a6e..dc7743d3871e 100644
--- a/python/src/com/jetbrains/python/debugger/statistics/PyDataViewerCollector.kt
+++ b/python/src/com/jetbrains/python/debugger/statistics/PyDataViewerCollector.kt
@@ -11,7 +11,15 @@ object PyDataViewerCollector : CounterUsagesCollector() {
 
   private val GROUP = EventLogGroup("python.dataview", 3)
 
-  enum class DataType(val typeName: String?) {
+  private val DATA_TYPE_FIELD = EventFields.Enum<DataType>("type")
+  private val DIMENSIONS_FIELD = EventFields.Enum<DataDimensions>("dimensions")
+  private val ROWS_COUNT_FIELD = RoundedIntEventField("rows_count")
+  private val COLUMNS_COUNT_FIELD = RoundedIntEventField("columns_count")
+
+  private val DATA_OPENED_EVENT = GROUP.registerVarargEvent("data.opened", DATA_TYPE_FIELD, DIMENSIONS_FIELD, ROWS_COUNT_FIELD, COLUMNS_COUNT_FIELD)
+  val SLICING_APPLIED_EVENT = GROUP.registerEvent("slicing.applied")
+
+  enum class DataType(private val typeName: String?) {
     ARRAY("ndarray"),
     DATAFRAME("DataFrame"),
     GEO_DATAFRAME("GeoDataFrame"),
@@ -51,21 +59,13 @@ object PyDataViewerCollector : CounterUsagesCollector() {
     }
   }
 
-  private val typeField = EventFields.Enum<DataType>("type")
-  private val dimensionsField = EventFields.Enum<DataDimensions>("dimensions")
-  private val rowsCountField = RoundedIntEventField("rows_count")
-  private val columnsCountField = RoundedIntEventField("columns_count")
-
-  val dataOpened = GROUP.registerVarargEvent("data.opened", typeField, dimensionsField, rowsCountField, columnsCountField)
-
-  val slicingApplied = GROUP.registerEvent("slicing.applied")
-
   override fun getGroup() = GROUP
 
   fun logDataOpened(project: Project?, type: String?, dimensions: Int?, rowsCount: Int, columnsCount: Int) {
-    dataOpened.log(project, this.typeField.with(DataType.getDataType(type)),
-                   this.dimensionsField.with(DataDimensions.getDataDimensions(dimensions)),
-                   this.rowsCountField.with(rowsCount),
-                   this.columnsCountField.with(columnsCount))
+    DATA_OPENED_EVENT.log(project,
+                          DATA_TYPE_FIELD.with(DataType.getDataType(type)),
+                          DIMENSIONS_FIELD.with(DataDimensions.getDataDimensions(dimensions)),
+                          ROWS_COUNT_FIELD.with(rowsCount),
+                          COLUMNS_COUNT_FIELD.with(columnsCount))
   }
 }
\ No newline at end of file