Partial code cleanup: can be private and some others applied

core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/DeclaredMemberIndex.kt

@@ -39,7 +39,10 @@ interface DeclaredMemberIndex {
     }
 }
 
-open class ClassDeclaredMemberIndex(val jClass: JavaClass, val memberFilter: (JavaMember) -> Boolean) : DeclaredMemberIndex {
+open class ClassDeclaredMemberIndex(
+        val jClass: JavaClass,
+        private val memberFilter: (JavaMember) -> Boolean
+) : DeclaredMemberIndex {
     private val methodFilter = {
         m: JavaMethod ->
         memberFilter(m) && !DescriptorResolverUtils.isObjectMethodInInterface(m)

core/descriptors/src/org/jetbrains/kotlin/descriptors/EffectiveVisibility.kt

@@ -262,7 +262,7 @@ enum class RelationToType(val description: String) {
     override fun toString() = description
 }
 
-data class DescriptorWithRelation(val descriptor: ClassifierDescriptor, val relation: RelationToType) {
+data class DescriptorWithRelation(val descriptor: ClassifierDescriptor, private val relation: RelationToType) {
     fun effectiveVisibility() =
             (descriptor as? ClassDescriptor)?.visibility?.effectiveVisibility(descriptor, false) ?: Public
 

core/descriptors/src/org/jetbrains/kotlin/renderer/ClassifierNamePolicy.kt

@@ -50,11 +50,10 @@ interface ClassifierNamePolicy {
 
     // for local declarations qualified up to function scope
     object SOURCE_CODE_QUALIFIED : ClassifierNamePolicy {
-        override fun renderClassifier(classifier: ClassifierDescriptor, renderer: DescriptorRenderer): String {
-            return qualifiedNameForSourceCode(classifier)
-        }
+        override fun renderClassifier(classifier: ClassifierDescriptor, renderer: DescriptorRenderer): String =
+                qualifiedNameForSourceCode(classifier)
 
-        fun qualifiedNameForSourceCode(descriptor: ClassifierDescriptor): String {
+        private fun qualifiedNameForSourceCode(descriptor: ClassifierDescriptor): String {
             val nameString = descriptor.name.render()
             if (descriptor is TypeParameterDescriptor) {
                 return nameString