diff --git a/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.kt b/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.kt
index 00ab80cd20e..1072edc9bbb 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.kt
+++ b/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.kt
@@ -68,25 +68,20 @@ internal class DescriptorRendererImpl(
         }
     }
 
-    private fun lt(): String {
-        return escape("<")
-    }
-
-    private fun gt(): String {
-        return escape(">")
-    }
+    private fun lt() = escape("<")
+    private fun gt() = escape(">")
 
     private fun arrow(): String {
-        when (textFormat) {
-            DescriptorRenderer.TextFormat.PLAIN -> return escape("->")
-            DescriptorRenderer.TextFormat.HTML -> return "&rarr;"
+        return when (textFormat) {
+            DescriptorRenderer.TextFormat.PLAIN -> escape("->")
+            DescriptorRenderer.TextFormat.HTML -> "&rarr;"
         }
     }
 
     private fun renderMessage(message: String): String {
-        when (textFormat) {
-            DescriptorRenderer.TextFormat.PLAIN -> return message
-            DescriptorRenderer.TextFormat.HTML -> return "<i>" + message + "</i>"
+        return when (textFormat) {
+            DescriptorRenderer.TextFormat.PLAIN -> message
+            DescriptorRenderer.TextFormat.HTML -> "<i>$message</i>"
         }
     }