diff --git a/app/src/main/java/net/pokeranalytics/android/calculus/Calculator.kt b/app/src/main/java/net/pokeranalytics/android/calculus/Calculator.kt
index 4ae6a252..592a6c69 100644
--- a/app/src/main/java/net/pokeranalytics/android/calculus/Calculator.kt
+++ b/app/src/main/java/net/pokeranalytics/android/calculus/Calculator.kt
@@ -277,12 +277,12 @@ class Calculator {
 
 			val maxNetResult = computables.max(ComputableResult.Field.RATED_NET.identifier)?.toDouble()
 			maxNetResult?.let {
-				results.addStat(MAXIMUM_NETRESULT, it)
+				results.addStat(MAXIMUM_NET_RESULT, it)
 			}
 
 			val minNetResult = computables.min(ComputableResult.Field.RATED_NET.identifier)?.toDouble()
 			minNetResult?.let {
-				results.addStat(MINIMUM_NETRESULT, it)
+				results.addStat(MINIMUM_NET_RESULT, it)
 			}
 
 			Stat.netBBPer100Hands(bbSum, totalHands)?.let { netBB100 ->
diff --git a/app/src/main/java/net/pokeranalytics/android/calculus/Stat.kt b/app/src/main/java/net/pokeranalytics/android/calculus/Stat.kt
index c07acdd6..373edf4a 100644
--- a/app/src/main/java/net/pokeranalytics/android/calculus/Stat.kt
+++ b/app/src/main/java/net/pokeranalytics/android/calculus/Stat.kt
@@ -45,8 +45,8 @@ enum class Stat(override var uniqueIdentifier: Int) : IntIdentifiable, RowRepres
 	HANDS_PLAYED(18),
 	LOCATIONS_PLAYED(19),
 	LONGEST_STREAKS(20),
-	MAXIMUM_NETRESULT(21),
-	MINIMUM_NETRESULT(22),
+	MAXIMUM_NET_RESULT(21),
+	MINIMUM_NET_RESULT(22),
 	MAXIMUM_DURATION(23),
 	DAYS_PLAYED(24),
 	WINNING_SESSION_COUNT(25),
@@ -129,8 +129,8 @@ enum class Stat(override var uniqueIdentifier: Int) : IntIdentifiable, RowRepres
 				HANDS_PLAYED -> R.string.number_of_hands
 				LOCATIONS_PLAYED -> R.string.locations_played
 				LONGEST_STREAKS -> R.string.longest_streaks
-				MAXIMUM_NETRESULT -> R.string.max_net_result
-				MINIMUM_NETRESULT -> R.string.min_net_result
+				MAXIMUM_NET_RESULT -> R.string.max_net_result
+				MINIMUM_NET_RESULT -> R.string.min_net_result
 				MAXIMUM_DURATION -> R.string.longest_session
 				DAYS_PLAYED -> R.string.days_played
 				TOTAL_BUYIN -> R.string.total_buyin
@@ -152,7 +152,7 @@ enum class Stat(override var uniqueIdentifier: Int) : IntIdentifiable, RowRepres
 
 		when (this) {
 			// Amounts + red/green
-			NET_RESULT, HOURLY_RATE, AVERAGE, MAXIMUM_NETRESULT, MINIMUM_NETRESULT -> {
+			NET_RESULT, HOURLY_RATE, AVERAGE, MAXIMUM_NET_RESULT, MINIMUM_NET_RESULT -> {
 				val color = if (value >= this.threshold) R.color.green else R.color.red
 				return TextFormat(value.toCurrency(currency), color)
 			}
diff --git a/app/src/main/java/net/pokeranalytics/android/calculus/calcul/StatRepresentable.kt b/app/src/main/java/net/pokeranalytics/android/calculus/calcul/StatRepresentable.kt
index 5febf527..f1e32e48 100644
--- a/app/src/main/java/net/pokeranalytics/android/calculus/calcul/StatRepresentable.kt
+++ b/app/src/main/java/net/pokeranalytics/android/calculus/calcul/StatRepresentable.kt
@@ -34,8 +34,8 @@ class StatRepresentable(var stat: Stat) : RowRepresentable {
                 Stat.HANDS_PLAYED -> R.string.number_of_hands
                 Stat.LOCATIONS_PLAYED -> R.string.locations_played
                 Stat.LONGEST_STREAKS -> R.string.longest_streaks
-                Stat.MAXIMUM_NETRESULT -> R.string.max_net_result
-                Stat.MINIMUM_NETRESULT -> R.string.min_net_result
+                Stat.MAXIMUM_NET_RESULT -> R.string.max_net_result
+                Stat.MINIMUM_NET_RESULT -> R.string.min_net_result
                 Stat.MAXIMUM_DURATION -> R.string.longest_session
                 Stat.DAYS_PLAYED -> R.string.days_played
                 Stat.TOTAL_BUYIN -> R.string.total_buyin
@@ -47,7 +47,7 @@ class StatRepresentable(var stat: Stat) : RowRepresentable {
         }
     }
 
-    override val resId: Int?
+    override val resId: Int
         get() {
             return resId(this.stat)
         }
diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/Result.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/Result.kt
index ce63e633..7298726d 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/realm/Result.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/realm/Result.kt
@@ -114,7 +114,7 @@ open class Result : RealmObject(), Filterable {
     // Computes the Net
     private fun computeNet(withBuyin: Boolean? = null) {
 
-        val transactionsSum = transactions.sumByDouble { it.amount }
+        val transactionsSum = transactions.sumOf { it.amount }
 
 	    // choose the method to compute the net
 	    var useBuyin = withBuyin ?: true
diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/SessionSet.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/SessionSet.kt
index 32998dd8..20025072 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/realm/SessionSet.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/realm/SessionSet.kt
@@ -61,9 +61,9 @@ open class SessionSet() : RealmObject(), Timed, Filterable {
     override var netDuration: Long = 0L
 
 	fun computeStats() {
-		this.ratedNet = this.sessions?.sumByDouble { it.computableResult?.ratedNet ?: 0.0 } ?: 0.0
-		this.estimatedHands = this.sessions?.sumByDouble { it.estimatedHands } ?: 0.0
-		this.bbNet = this.sessions?.sumByDouble { it.bbNet } ?: 0.0
+		this.ratedNet = this.sessions?.sumOf { it.computableResult?.ratedNet ?: 0.0 } ?: 0.0
+		this.estimatedHands = this.sessions?.sumOf { it.estimatedHands } ?: 0.0
+		this.bbNet = this.sessions?.sumOf { it.bbNet } ?: 0.0
 		this.breakDuration =  this.sessions?.max("breakDuration")?.toLong() ?: 0L
 	}
 
diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/handhistory/HandHistory.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/handhistory/HandHistory.kt
index 3dfbbfdd..c8db6f7c 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/realm/handhistory/HandHistory.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/realm/handhistory/HandHistory.kt
@@ -332,7 +332,7 @@ open class HandHistory : RealmObject(), Deletable, RowRepresentable, Filterable,
 		val sortedActions = this.sortedActions
 		val firstIndexOfStreet = sortedActions.firstOrNull { it.street == street }?.index
 			?: sortedActions.size
-		return this.anteSum + sortedActions.take(firstIndexOfStreet).sumByDouble { it.effectiveAmount }
+		return this.anteSum + sortedActions.take(firstIndexOfStreet).sumOf { it.effectiveAmount }
 	}
 
 	@Ignore
@@ -579,14 +579,14 @@ open class HandHistory : RealmObject(), Deletable, RowRepresentable, Filterable,
 			val allinPositions = streetActions.filter { it.type?.isAllin == true }.map { it.position }
 
 			if (allinPositions.isEmpty()) {
-				runningPotAmount += streetActions.sumByDouble { it.effectiveAmount }
+				runningPotAmount += streetActions.sumOf { it.effectiveAmount }
 			} else {
 				val amountsPerPosition = mutableListOf<PositionAmount>()
 
 				// get all committed amounts for the street by player, by allin
 				this.positionIndexes.map { position ->
 					val playerActions = streetActions.filter { it.position == position }
-					val sum = playerActions.sumByDouble { it.effectiveAmount }
+					val sum = playerActions.sumOf { it.effectiveAmount }
 					amountsPerPosition.add(PositionAmount(position, sum, allinPositions.contains(position)))
 				}
 				amountsPerPosition.sortWith(this) // sort by value, then allin. Allin must be first of equal values sequence
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/calendar/CalendarDetailsFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/calendar/CalendarDetailsFragment.kt
index cca49923..2e3a1dbb 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/modules/calendar/CalendarDetailsFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/calendar/CalendarDetailsFragment.kt
@@ -17,9 +17,9 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import net.pokeranalytics.android.R
-import net.pokeranalytics.android.calculus.calcul.defaultStatEntries
 import net.pokeranalytics.android.calculus.Calculator
 import net.pokeranalytics.android.calculus.Stat
+import net.pokeranalytics.android.calculus.calcul.defaultStatEntries
 import net.pokeranalytics.android.databinding.FragmentCalendarDetailsBinding
 import net.pokeranalytics.android.model.filter.Query
 import net.pokeranalytics.android.model.filter.QueryCondition
@@ -32,11 +32,10 @@ import net.pokeranalytics.android.ui.helpers.AppReviewManager
 import net.pokeranalytics.android.ui.view.RowRepresentable
 import net.pokeranalytics.android.ui.view.RowViewType
 import net.pokeranalytics.android.ui.view.rows.CustomizableRowRepresentable
-import net.pokeranalytics.android.ui.view.rows.GraphRow
 import net.pokeranalytics.android.ui.view.rows.DualStatRow
+import net.pokeranalytics.android.ui.view.rows.GraphRow
 import timber.log.Timber
 import java.util.*
-import kotlin.collections.ArrayList
 
 class CalendarDetailsFragment : BaseFragment(), StaticRowRepresentableDataSource, RowRepresentableDelegate {
 
@@ -215,7 +214,7 @@ class CalendarDetailsFragment : BaseFragment(), StaticRowRepresentableDataSource
 							stat = Stat.STANDARD_DEVIATION
 						)
 					)
-					rowRepresentables.add(DualStatRow(it.computedStat(Stat.WIN_RATIO), it.computedStat(Stat.MAXIMUM_NETRESULT)))
+					rowRepresentables.add(DualStatRow(it.computedStat(Stat.WIN_RATIO), it.computedStat(Stat.MAXIMUM_NET_RESULT)))
 					rowRepresentables.add(CustomizableRowRepresentable(RowViewType.HEADER_TITLE, resId = R.string.volume))
 					rowRepresentables.add(GraphRow(durationDataSet, report = report, stat = Stat.HOURLY_DURATION))
 					rowRepresentables.add(DualStatRow(it.computedStat(Stat.HOURLY_DURATION), it.computedStat(Stat.AVERAGE_HOURLY_DURATION)))
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/data/CustomFieldDataFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/data/CustomFieldDataFragment.kt
index 29920edc..9da74881 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/modules/data/CustomFieldDataFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/data/CustomFieldDataFragment.kt
@@ -211,9 +211,9 @@ class CustomFieldDataFragment : EditableDataFragment(), StaticRowRepresentableDa
 	 */
 	private fun initUI() {
 
-        val addItem = binding.addItem
-        val sortChoices = binding.sortChoices
-        val sortDescending = binding.sortDescending
+//        val addItem = binding.addItem
+//        val sortChoices = binding.sortChoices
+//        val sortDescending = binding.sortDescending
         val recyclerView = binding.recyclerView
 
 		customField.updateRowRepresentation()
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/session/SessionFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/session/SessionFragment.kt
index fa0f1518..dca44216 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/modules/session/SessionFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/session/SessionFragment.kt
@@ -408,7 +408,7 @@ class SessionFragment : RealmFragment(), RowRepresentableDelegate, StaticRowRepr
 
 		CoroutineScope(coroutineContext).launch {
 
-			var optimalDuration: Double? = null
+			var optimalDuration: Double?
 
 			val cr = GlobalScope.async {
 			}