diff --git a/idea/src/org/jetbrains/kotlin/idea/presentation/KtFunctionPresenter.kt b/idea/src/org/jetbrains/kotlin/idea/presentation/KtFunctionPresenter.kt
index 65247f3abee..f1229a1c370 100644
--- a/idea/src/org/jetbrains/kotlin/idea/presentation/KtFunctionPresenter.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/presentation/KtFunctionPresenter.kt
@@ -16,11 +16,8 @@
 
 package org.jetbrains.kotlin.idea.presentation
 
-import com.google.common.base.Function
-import com.google.common.collect.Collections2
 import com.intellij.navigation.ItemPresentation
 import com.intellij.navigation.ItemPresentationProvider
-import org.apache.commons.lang.StringUtils
 import org.jetbrains.kotlin.psi.KtConstructor
 import org.jetbrains.kotlin.psi.KtFunction
 import org.jetbrains.kotlin.psi.KtFunctionLiteral
@@ -34,34 +31,22 @@ class KtFunctionPresenter : ItemPresentationProvider<KtFunction> {
                 return buildString {
                     function.name?.let { append(it) }
 
-                    val paramsStrings = Collections2.transform(function.valueParameters, Function<org.jetbrains.kotlin.psi.KtParameter, kotlin.String> { parameter ->
-                        if (parameter != null) {
-                            val reference = parameter.typeReference
-                            if (reference != null) {
-                                val text = reference.text
-                                if (text != null) {
-                                    return@Function text
-                                }
-                            }
-                        }
-
-                        "?"
-                    })
-
-                    append("(").append(StringUtils.join(paramsStrings, ",")).append(")")
+                    append("(")
+                    append(function.valueParameters.joinToString { it.typeReference?.text ?: "" })
+                    append(")")
                 }
             }
 
-            override fun getLocationString(): String {
+            override fun getLocationString(): String? {
                 if (function is KtConstructor<*>) {
-                    val name = function.getContainingClassOrObject().fqName ?: return ""
+                    val name = function.getContainingClassOrObject().fqName ?: return null
                     return "(in $name)"
                 }
 
-                val name = function.fqName ?: return ""
+                val name = function.fqName ?: return null
                 val receiverTypeRef = function.receiverTypeReference
                 val extensionLocation = if (receiverTypeRef != null) "for " + receiverTypeRef.text + " " else ""
-                return "(%sin %s)".format(extensionLocation, name.parent())
+                return "(${extensionLocation}in ${name.parent()})"
             }
         }
     }
diff --git a/idea/src/org/jetbrains/kotlin/idea/presentation/KtLightClassListCellRenderer.kt b/idea/src/org/jetbrains/kotlin/idea/presentation/KtLightClassListCellRenderer.kt
index 84afe08d52f..5deedca6776 100644
--- a/idea/src/org/jetbrains/kotlin/idea/presentation/KtLightClassListCellRenderer.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/presentation/KtLightClassListCellRenderer.kt
@@ -21,22 +21,9 @@ import com.intellij.psi.presentation.java.ClassPresentationUtil
 import org.jetbrains.kotlin.asJava.KtLightClass
 
 class KtLightClassListCellRenderer : PsiElementListCellRenderer<KtLightClass>() {
-    override fun getElementText(element: KtLightClass): String {
-        return ClassPresentationUtil.getNameForClass(element, false)
-    }
+    override fun getElementText(element: KtLightClass) = ClassPresentationUtil.getNameForClass(element, false)
 
-    override fun getContainerText(element: KtLightClass, name: String): String? {
-        return getContainerTextStatic(element)
-    }
+    override fun getContainerText(element: KtLightClass, name: String) = "(" + element.getFqName().parent() + ")"
 
-    override fun getIconFlags(): Int {
-        return 0
-    }
-
-    companion object {
-
-        fun getContainerTextStatic(element: KtLightClass): String? {
-            return "(" + element.getFqName().parent() + ")"
-        }
-    }
+    override fun getIconFlags() = 0
 }
diff --git a/idea/src/org/jetbrains/kotlin/idea/presentation/KtObjectPresenter.kt b/idea/src/org/jetbrains/kotlin/idea/presentation/KtObjectPresenter.kt
index 82576110f27..bc298a68eb9 100644
--- a/idea/src/org/jetbrains/kotlin/idea/presentation/KtObjectPresenter.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/presentation/KtObjectPresenter.kt
@@ -16,12 +16,9 @@
 
 package org.jetbrains.kotlin.idea.presentation
 
-import com.intellij.navigation.ItemPresentation
 import com.intellij.navigation.ItemPresentationProvider
 import org.jetbrains.kotlin.psi.KtObjectDeclaration
 
 class KtObjectPresenter : ItemPresentationProvider<KtObjectDeclaration> {
-    override fun getPresentation(item: KtObjectDeclaration): ItemPresentation {
-        return KotlinDefaultNamedDeclarationPresentation(item)
-    }
+    override fun getPresentation(item: KtObjectDeclaration) = KotlinDefaultNamedDeclarationPresentation(item)
 }
diff --git a/idea/src/org/jetbrains/kotlin/idea/presentation/KtParameterPresenter.kt b/idea/src/org/jetbrains/kotlin/idea/presentation/KtParameterPresenter.kt
index 8e9d65fd765..c02c24b0a74 100644
--- a/idea/src/org/jetbrains/kotlin/idea/presentation/KtParameterPresenter.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/presentation/KtParameterPresenter.kt
@@ -16,12 +16,9 @@
 
 package org.jetbrains.kotlin.idea.presentation
 
-import com.intellij.navigation.ItemPresentation
 import com.intellij.navigation.ItemPresentationProvider
 import org.jetbrains.kotlin.psi.KtParameter
 
 class KtParameterPresenter : ItemPresentationProvider<KtParameter> {
-    override fun getPresentation(item: KtParameter): ItemPresentation {
-        return KotlinDefaultNamedDeclarationPresentation(item)
-    }
+    override fun getPresentation(item: KtParameter) = KotlinDefaultNamedDeclarationPresentation(item)
 }
diff --git a/idea/src/org/jetbrains/kotlin/idea/presentation/KtPropertyPresenter.kt b/idea/src/org/jetbrains/kotlin/idea/presentation/KtPropertyPresenter.kt
index aa0b72279ff..185dc51a35c 100644
--- a/idea/src/org/jetbrains/kotlin/idea/presentation/KtPropertyPresenter.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/presentation/KtPropertyPresenter.kt
@@ -16,12 +16,9 @@
 
 package org.jetbrains.kotlin.idea.presentation
 
-import com.intellij.navigation.ItemPresentation
 import com.intellij.navigation.ItemPresentationProvider
 import org.jetbrains.kotlin.psi.KtProperty
 
 class KtPropertyPresenter : ItemPresentationProvider<KtProperty> {
-    override fun getPresentation(item: KtProperty): ItemPresentation {
-        return KotlinDefaultNamedDeclarationPresentation(item)
-    }
+    override fun getPresentation(item: KtProperty) = KotlinDefaultNamedDeclarationPresentation(item)
 }