diff --git a/build.gradle.kts b/build.gradle.kts
index 75c5b6ec..dc3f4968 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -20,17 +20,15 @@ buildscript {
 apply(plugin = "kotlinx.team.infra")
 
 configure<InfraExtension> {
-    teamcity {
-        libraryStagingRepoDescription = project.name
-    }
-
     publishing {
         include(":kotlinx-benchmark-runtime")
 
         libraryRepoUrl = "https://github.com/Kotlin/kotlinx-benchmark"
 
         if (project.findProperty("publication_repository") == "sonatype") {
-            sonatype {}
+            sonatype {
+                libraryStagingRepoDescription = project.name
+            }
         }
     }
 }
diff --git a/plugin/build.gradle.kts b/plugin/build.gradle.kts
index 69ed90ec..da2b82df 100644
--- a/plugin/build.gradle.kts
+++ b/plugin/build.gradle.kts
@@ -28,7 +28,6 @@ plugins {
     kotlin("jvm") version "1.9.0"
 }
 
-apply(plugin = "org.jetbrains.kotlin.jvm")
 apply(plugin = "kotlinx.team.infra")
 
 configure<InfraExtension> {
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 18e70bb9..e6c4b85f 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -2,10 +2,8 @@ pluginManagement {
     repositories {
         gradlePluginPortal()
         val kotlin_repo_url: String? by settings
-        kotlin_repo_url?.let { repoUrl ->
-            if (repoUrl.isNotEmpty()) {
-                maven { url = uri(repoUrl) }
-            }
+        kotlin_repo_url?.takeIf { it.isNotEmpty() }?.let { repoUrl ->
+            maven { url = uri(repoUrl) }
         }
     }
 }