diff --git a/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/application/nodeinfo/Nodeinfo2_0.kt b/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/application/nodeinfo/Nodeinfo2_0.kt
index 519477dd..281099e0 100644
--- a/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/application/nodeinfo/Nodeinfo2_0.kt
+++ b/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/application/nodeinfo/Nodeinfo2_0.kt
@@ -1,5 +1,6 @@
 package dev.usbharu.hideout.activitypub.application.nodeinfo
 
+@Suppress("ClassName")
 data class Nodeinfo2_0(
     val version: String = "2,0",
     val software: Map<String, String>,
diff --git a/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/wellknown/HostmetaController.kt b/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/wellknown/HostmetaController.kt
index 7b11c9cb..81641d1a 100644
--- a/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/wellknown/HostmetaController.kt
+++ b/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/wellknown/HostmetaController.kt
@@ -19,12 +19,8 @@ class HostmetaController(private val linkList: List<Link> = emptyList()) {
 
     @Order(2)
     @GetMapping("/host-meta", produces = ["application/json"])
-    fun hostmetaJson(): XRD {
-        return XRD(linkList)
-    }
+    fun hostmetaJson(): XRD = XRD(linkList)
 
     @GetMapping("/host-meta.json", produces = ["application/json"])
-    fun hostmetaJson2(): XRD {
-        return XRD(linkList)
-    }
+    fun hostmetaJson2(): XRD = XRD(linkList)
 }
diff --git a/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/wellknown/NodeinfoController.kt b/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/wellknown/NodeinfoController.kt
index 35598fa9..4fc95339 100644
--- a/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/wellknown/NodeinfoController.kt
+++ b/hideout/hideout-activitypub/src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/wellknown/NodeinfoController.kt
@@ -28,12 +28,8 @@ class NodeinfoController(
     )
 
     @GetMapping("/nodeinfo/2.0", produces = ["application/json"])
-    suspend fun nodeinfo2_0(): Nodeinfo2_0 {
-        return nodeinfoApplicationService.execute(NodeinfoRequest("2.0"), Anonymous)
-    }
+    suspend fun nodeinfo2_0(): Nodeinfo2_0 = nodeinfoApplicationService.execute(NodeinfoRequest("2.0"), Anonymous)
 
     @GetMapping("/nodeinfo/2.1", produces = ["application/json"])
-    suspend fun nodeinfo2_1(): Nodeinfo2_0 {
-        return nodeinfoApplicationService.execute(NodeinfoRequest("2.1"), Anonymous)
-    }
+    suspend fun nodeinfo2_1(): Nodeinfo2_0 = nodeinfoApplicationService.execute(NodeinfoRequest("2.1"), Anonymous)
 }