diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/DataList.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/DataList.kt
index 5ffea23c..a7f8fda5 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/realm/DataList.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/realm/DataList.kt
@@ -18,11 +18,11 @@ enum class DataList {
         return realm.where(this.relatedEntity).findAll().sort(fieldName?:this.sortingFieldName, sortOrder?:this.sorting)
     }
 
-    var sortingFieldName: String = "name"
-    var sorting: Sort = Sort.DESCENDING
+    private var sortingFieldName: String = "name"
+    private var sorting: Sort = Sort.DESCENDING
 
 
-    val relatedEntity: Class < out RealmObject >
+    private val relatedEntity: Class < out RealmObject >
         get() {
             return when (this) {
                 NONE -> RealmObject::class.java
@@ -46,7 +46,7 @@ enum class DataList {
     }
 
     fun updateOrCreate(realm:Realm, primaryKey:String?): RealmObject {
-        var proxyItem: RealmObject? = this.getData(realm, primaryKey)
+        val proxyItem: RealmObject? = this.getData(realm, primaryKey)
         proxyItem?.let {
             return realm.copyFromRealm(it)
         } ?: run {
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/adapter/components/DynamicRowInterface.kt b/app/src/main/java/net/pokeranalytics/android/ui/adapter/components/DynamicRowInterface.kt
index 9dbc9d52..bff7f869 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/adapter/components/DynamicRowInterface.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/adapter/components/DynamicRowInterface.kt
@@ -193,7 +193,7 @@ enum class SettingRow(val resId: Int) : DynamicRowInterface {
 		return context.getString(this.resId)
 	}
 
-	override var viewType: Int = RowViewType.TITLE.ordinal
+	override val viewType: Int = RowViewType.TITLE.ordinal
 
 	override val relatedDataList : DataList
 		get() {