diff --git a/backend/src/main/kotlin/uk/co/neviyn/observationdatabase/Email.kt b/backend/src/main/kotlin/uk/co/neviyn/observationdatabase/Email.kt
index 293bd4f..f6f53b7 100644
--- a/backend/src/main/kotlin/uk/co/neviyn/observationdatabase/Email.kt
+++ b/backend/src/main/kotlin/uk/co/neviyn/observationdatabase/Email.kt
@@ -24,7 +24,6 @@ class Email {
         }
         if (environment.getProperty("smtp.enabled")!!.toBoolean()) {
             logger.debug("SMTP is enables")
-            logger.debug("Building CSV file content")
             logger.debug("Setting up mailer environment")
             val mailer = createMailer()
             logger.debug("Constructing email")
diff --git a/backend/src/main/kotlin/uk/co/neviyn/observationdatabase/GroupSessionManager.kt b/backend/src/main/kotlin/uk/co/neviyn/observationdatabase/GroupSessionManager.kt
index b3bfdba..4a9fba8 100644
--- a/backend/src/main/kotlin/uk/co/neviyn/observationdatabase/GroupSessionManager.kt
+++ b/backend/src/main/kotlin/uk/co/neviyn/observationdatabase/GroupSessionManager.kt
@@ -55,7 +55,7 @@ object GroupSessionManager {
         scenarioTitles?.forEach { title ->
             output[title] = mutableListOf()
         }
-        observations.forEach { k, v ->
+        observations.forEach { (k, v) ->
             v.scenarios.forEach {
                 output[it.title]?.add(it.copy(title = k))
             }
diff --git a/backend/src/main/kotlin/uk/co/neviyn/observationdatabase/controller/GroupSessionController.kt b/backend/src/main/kotlin/uk/co/neviyn/observationdatabase/controller/GroupSessionController.kt
index 6f4756c..41666ef 100644
--- a/backend/src/main/kotlin/uk/co/neviyn/observationdatabase/controller/GroupSessionController.kt
+++ b/backend/src/main/kotlin/uk/co/neviyn/observationdatabase/controller/GroupSessionController.kt
@@ -207,14 +207,14 @@ class GroupSessionController {
             retryCount++
             Thread.sleep(1_000) // Sleep for 1 second
         }
-        if (ipv4 != null && this::environment.isInitialized)
-            return mapOf("ip" to ipv4, "port" to environment["local.server.port"]!!)
+        return if (ipv4 != null && this::environment.isInitialized)
+            mapOf("ip" to ipv4, "port" to environment["local.server.port"]!!)
         else if (ipv4 == null) {
             logger.error("IP Address could not be determined")
-            return mapOf("error" to "Could not determine IP Address")
+            mapOf("error" to "Could not determine IP Address")
         } else {
             logger.error("Port could not be determined, environment not initialised")
-            return mapOf("error" to "Could not determine port")
+            mapOf("error" to "Could not determine port")
         }
     }
 }
\ No newline at end of file