diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDELightClassGenerationSupport.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDELightClassGenerationSupport.kt
index 3c5760cef10..b7f9f401df7 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDELightClassGenerationSupport.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDELightClassGenerationSupport.kt
@@ -164,7 +164,7 @@ public class IDELightClassGenerationSupport(private val project: Project) : Ligh
 
         val lightClasses = ArrayList<PsiClass>()
         lightClasses.add(lightClassForFacade)
-        if (facadeFiles.size() > 1) {
+        if (facadeFiles.size > 1) {
             lightClasses.addAll(facadeFiles.map {
                 FakeLightClassForFileOfPackage(lightClassForFacade, it)
             })
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinOutOfBlockCompletionModificationTracker.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinOutOfBlockCompletionModificationTracker.kt
index 6339f9388b2..41b57283495 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinOutOfBlockCompletionModificationTracker.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinOutOfBlockCompletionModificationTracker.kt
@@ -29,7 +29,7 @@ import org.jetbrains.kotlin.asJava.KotlinCodeBlockModificationListener
 public class KotlinOutOfBlockCompletionModificationTracker() : SimpleModificationTracker() {
     companion object {
         public fun getInstance(project: Project): KotlinOutOfBlockCompletionModificationTracker
-                = ServiceManager.getService(project, javaClass<KotlinOutOfBlockCompletionModificationTracker>())!!
+                = ServiceManager.getService(project, KotlinOutOfBlockCompletionModificationTracker::class.java)!!
     }
 }
 
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinResolveCache.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinResolveCache.kt
index f44ec525429..632d842f264 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinResolveCache.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinResolveCache.kt
@@ -60,7 +60,7 @@ internal class PerFileAnalysisCache(val file: KtFile, val componentProvider: Com
             descendantsOfCurrent.add(current)
         }
 
-        cache.keySet().removeAll(toRemove)
+        cache.keys.removeAll(toRemove)
 
         return result
     }
@@ -109,18 +109,18 @@ internal class PerFileAnalysisCache(val file: KtFile, val componentProvider: Com
 
 private object KotlinResolveDataProvider {
     private val topmostElementTypes = arrayOf<Class<out PsiElement?>?>(
-            javaClass<KtNamedFunction>(),
-            javaClass<KtAnonymousInitializer>(),
-            javaClass<KtProperty>(),
-            javaClass<KtImportDirective>(),
-            javaClass<KtPackageDirective>(),
-            javaClass<KtCodeFragment>(),
+            KtNamedFunction::class.java,
+            KtAnonymousInitializer::class.java,
+            KtProperty::class.java,
+            KtImportDirective::class.java,
+            KtPackageDirective::class.java,
+            KtCodeFragment::class.java,
             // TODO: Non-analyzable so far, add more granular analysis
-            javaClass<KtAnnotationEntry>(),
-            javaClass<KtTypeConstraint>(),
-            javaClass<KtSuperTypeList>(),
-            javaClass<KtTypeParameter>(),
-            javaClass<KtParameter>()
+            KtAnnotationEntry::class.java,
+            KtTypeConstraint::class.java,
+            KtSuperTypeList::class.java,
+            KtTypeParameter::class.java,
+            KtParameter::class.java
     )
 
     fun findAnalyzableParent(element: KtElement): KtElement {
@@ -134,12 +134,12 @@ private object KotlinResolveDataProvider {
             is KtTypeConstraint,
             is KtSuperTypeList,
             is KtTypeParameter,
-            is KtParameter -> PsiTreeUtil.getParentOfType(topmostElement, javaClass<KtClassOrObject>(), javaClass<KtCallableDeclaration>())
+            is KtParameter -> PsiTreeUtil.getParentOfType(topmostElement, KtClassOrObject::class.java, KtCallableDeclaration::class.java)
             else -> topmostElement
         }
         return analyzableElement
                     // if none of the above worked, take the outermost declaration
-                    ?: PsiTreeUtil.getTopmostParentOfType(element, javaClass<KtDeclaration>())
+                    ?: PsiTreeUtil.getTopmostParentOfType(element, KtDeclaration::class.java)
                     // if even that didn't work, take the whole file
                     ?: element.getContainingKtFile()
     }
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/ModuleDependencyMapper.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/ModuleDependencyMapper.kt
index d4ce2ce6742..63907c46036 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/ModuleDependencyMapper.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/ModuleDependencyMapper.kt
@@ -46,7 +46,7 @@ fun createModuleResolverProvider(
     val allModuleInfos = collectAllModuleInfosFromIdeaModel(project).toHashSet()
 
     val syntheticFilesByModule = syntheticFiles.groupBy { it.getModuleInfo() }
-    val syntheticFilesModules = syntheticFilesByModule.keySet()
+    val syntheticFilesModules = syntheticFilesByModule.keys
     allModuleInfos.addAll(syntheticFilesModules)
 
     val modulesToCreateResolversFor = allModuleInfos.filter(moduleFilter)
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/ProjectResolutionFacade.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/ProjectResolutionFacade.kt
index 8c4a6228f5c..61f84e77e12 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/ProjectResolutionFacade.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/ProjectResolutionFacade.kt
@@ -98,7 +98,7 @@ internal class ResolutionFacadeImpl(
         get() = projectFacade.findModuleDescriptor(moduleInfo)
 
     override fun analyze(element: KtElement, bodyResolveMode: BodyResolveMode): BindingContext {
-        val resolveElementCache = getFrontendService(element, javaClass<ResolveElementCache>())
+        val resolveElementCache = getFrontendService(element, ResolveElementCache::class.java)
         return resolveElementCache.resolveToElement(element, bodyResolveMode)
     }
 
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/globalContextUtils.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/globalContextUtils.kt
index e33633636c6..b37e706837b 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/globalContextUtils.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/globalContextUtils.kt
@@ -44,7 +44,7 @@ private class ExceptionTrackerWithProcessCanceledReport() : ExceptionTracker() {
 
 
     companion object {
-        val LOG = Logger.getInstance(javaClass<ExceptionTrackerWithProcessCanceledReport>())
+        val LOG = Logger.getInstance(ExceptionTrackerWithProcessCanceledReport::class.java)
     }
 }
 
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/codeInsight/shorten/shortenWaitingSet.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/codeInsight/shorten/shortenWaitingSet.kt
index eb88b1b7fa4..0fc1d14565d 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/codeInsight/shorten/shortenWaitingSet.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/codeInsight/shorten/shortenWaitingSet.kt
@@ -79,7 +79,7 @@ public fun performDelayedShortening(project: Project) {
     }
 }
 
-private val LOG = Logger.getInstance(javaClass<Project>().getCanonicalName())
+private val LOG = Logger.getInstance(Project::class.java.getCanonicalName())
 
 public fun prepareElementsToShorten(project: Project) {
     val elementsToShorten = project.elementsToShorten
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/configuration/ModuleTypeCache.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/configuration/ModuleTypeCache.kt
index a9bf3e851c0..2f91b308dff 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/configuration/ModuleTypeCache.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/configuration/ModuleTypeCache.kt
@@ -33,7 +33,7 @@ import com.intellij.openapi.util.SimpleModificationTracker
 class ModuleTypeCacheManager private constructor(project: Project) {
     companion object {
         @JvmStatic
-        fun getInstance(project: Project) = ServiceManager.getService(project, javaClass<ModuleTypeCacheManager>())
+        fun getInstance(project: Project) = ServiceManager.getService(project, ModuleTypeCacheManager::class.java)
     }
 
     private val vfsModificationTracker = VfsModificationTracker(project)
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/KtDecompiledFile.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/KtDecompiledFile.kt
index 7acc8f9b015..7d91877037c 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/KtDecompiledFile.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/KtDecompiledFile.kt
@@ -74,7 +74,7 @@ open class KtDecompiledFile(
 
     private fun DeclarationDescriptor.findElementForDescriptor(): KtDeclaration? {
         return decompiledText.get().renderedDescriptorsToRange[descriptorToKey(this)]?.let { range ->
-            PsiTreeUtil.findElementOfClassAtRange(this@KtDecompiledFile, range.getStartOffset(), range.getEndOffset(), javaClass<KtDeclaration>())
+            PsiTreeUtil.findElementOfClassAtRange(this@KtDecompiledFile, range.getStartOffset(), range.getEndOffset(), KtDeclaration::class.java)
         }
     }
 
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/TypeClsStubBuilder.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/TypeClsStubBuilder.kt
index fc020318d9d..6c9794aac5e 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/TypeClsStubBuilder.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/TypeClsStubBuilder.kt
@@ -107,7 +107,7 @@ class TypeClsStubBuilder(private val c: ClsStubBuilderContext) {
         val typeArgumentsListStub = KotlinPlaceHolderStubImpl<KtTypeArgumentList>(typeStub, KtStubElementTypes.TYPE_ARGUMENT_LIST)
         typeArgumentProtoList.forEach { typeArgumentProto ->
             val projectionKind = typeArgumentProto.projection.toProjectionKind()
-            val typeProjection = KotlinTypeProjectionStubImpl(typeArgumentsListStub, projectionKind.ordinal())
+            val typeProjection = KotlinTypeProjectionStubImpl(typeArgumentsListStub, projectionKind.ordinal)
             if (projectionKind != KtProjectionKind.STAR) {
                 val modifierKeywordToken = projectionKind.token as? KtModifierKeywordToken
                 createModifierListStub(typeProjection, modifierKeywordToken.singletonOrEmptyList())
@@ -135,7 +135,7 @@ class TypeClsStubBuilder(private val c: ClsStubBuilderContext) {
 
         val parameterList = KotlinPlaceHolderStubImpl<KtParameterList>(functionType, KtStubElementTypes.VALUE_PARAMETER_LIST)
         val typeArgumentsWithoutReceiverAndReturnType
-                = typeArgumentList.subList(if (isExtensionFunctionType) 1 else 0, typeArgumentList.size() - 1)
+                = typeArgumentList.subList(if (isExtensionFunctionType) 1 else 0, typeArgumentList.size - 1)
         typeArgumentsWithoutReceiverAndReturnType.forEach { argument ->
             val parameter = KotlinParameterStubImpl(
                     parameterList, fqName = null, name = null, isMutable = false, hasValOrVar = false, hasDefaultValue = false
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextFactory.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextFactory.kt
index 123b63dc3ec..dd4ff1150e1 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextFactory.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextFactory.kt
@@ -107,7 +107,7 @@ public fun buildDecompiledText(
                     // descriptor instanceof PropertyDescriptor
                     builder.append(" ").append(DECOMPILED_CODE_COMMENT)
                 }
-                endOffset = builder.length()
+                endOffset = builder.length
             }
         }
         else if (descriptor is ClassDescriptor && !isEnumEntry(descriptor)) {
@@ -160,7 +160,7 @@ public fun buildDecompiledText(
             }
 
             builder.append(indent).append("}")
-            endOffset = builder.length()
+            endOffset = builder.length
         }
 
         builder.append("\n")
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/intentions/OperatorToFunctionIntention.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/intentions/OperatorToFunctionIntention.kt
index ae681372821..29c75f8a43a 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/intentions/OperatorToFunctionIntention.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/intentions/OperatorToFunctionIntention.kt
@@ -31,7 +31,7 @@ import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall
 import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
 import org.jetbrains.kotlin.util.OperatorNameConventions
 
-public class OperatorToFunctionIntention : SelfTargetingIntention<KtExpression>(javaClass(), "Replace overloaded operator with function call") {
+public class OperatorToFunctionIntention : SelfTargetingIntention<KtExpression>(KtExpression::class.java, "Replace overloaded operator with function call") {
     companion object {
         private fun isApplicablePrefix(element: KtPrefixExpression, caretOffset: Int): Boolean {
             val opRef = element.getOperationReference()
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/kdoc/KDocElementFactory.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/kdoc/KDocElementFactory.kt
index 41edb3bdb2a..2c8650c6cce 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/kdoc/KDocElementFactory.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/kdoc/KDocElementFactory.kt
@@ -28,7 +28,7 @@ class KDocElementFactory(val project: Project) {
     public fun createKDocFromText(text: String): KDoc {
         val fileText = text + " fun foo { }"
         val function = KtPsiFactory(project).createDeclaration<KtFunction>(fileText)
-        return PsiTreeUtil.findChildOfType(function, javaClass<KDoc>())!!
+        return PsiTreeUtil.findChildOfType(function, KDoc::class.java)!!
     }
 
     public fun createNameFromText(text: String): KDocName {
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/ResolveElementCache.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/ResolveElementCache.kt
index 29a0eac902b..8c3d3f15b90 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/ResolveElementCache.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/ResolveElementCache.kt
@@ -204,19 +204,19 @@ public class ResolveElementCache(
     private fun findElementOfAdditionalResolve(element: KtElement): KtElement? {
         val elementOfAdditionalResolve = KtPsiUtil.getTopmostParentOfTypes(
                 element,
-                javaClass<KtNamedFunction>(),
-                javaClass<KtAnonymousInitializer>(),
-                javaClass<KtSecondaryConstructor>(),
-                javaClass<KtProperty>(),
-                javaClass<KtParameter>(),
-                javaClass<KtSuperTypeList>(),
-                javaClass<KtInitializerList>(),
-                javaClass<KtImportList>(),
-                javaClass<KtAnnotationEntry>(),
-                javaClass<KtTypeParameter>(),
-                javaClass<KtTypeConstraint>(),
-                javaClass<KtPackageDirective>(),
-                javaClass<KtCodeFragment>()) as KtElement?
+                KtNamedFunction::class.java,
+                KtAnonymousInitializer::class.java,
+                KtSecondaryConstructor::class.java,
+                KtProperty::class.java,
+                KtParameter::class.java,
+                KtSuperTypeList::class.java,
+                KtInitializerList::class.java,
+                KtImportList::class.java,
+                KtAnnotationEntry::class.java,
+                KtTypeParameter::class.java,
+                KtTypeConstraint::class.java,
+                KtPackageDirective::class.java,
+                KtCodeFragment::class.java) as KtElement?
 
         when (elementOfAdditionalResolve) {
             null -> {
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/quickfix/QuickFixes.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/quickfix/QuickFixes.kt
index 7a1336332d3..46b572db3c0 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/quickfix/QuickFixes.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/quickfix/QuickFixes.kt
@@ -53,7 +53,7 @@ public class QuickFixes {
     }
 
     companion object {
-        public fun getInstance(): QuickFixes = ServiceManager.getService(javaClass<QuickFixes>())
+        public fun getInstance(): QuickFixes = ServiceManager.getService(QuickFixes::class.java)
     }
 }
 
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/KotlinReferenceContributor.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/KotlinReferenceContributor.kt
index 42da33c1e04..79c3151fd91 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/KotlinReferenceContributor.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/KotlinReferenceContributor.kt
@@ -27,11 +27,11 @@ import org.jetbrains.kotlin.psi.*
 public class KotlinReferenceContributor() : PsiReferenceContributor() {
     public override fun registerReferenceProviders(registrar: PsiReferenceRegistrar) {
         with(registrar) {
-            registerProvider(javaClass<KtSimpleNameExpression>()) {
+            registerProvider(KtSimpleNameExpression::class.java) {
                 KtSimpleNameReference(it)
             }
 
-            registerMultiProvider(javaClass<KtNameReferenceExpression>()) {
+            registerMultiProvider(KtNameReferenceExpression::class.java) {
                 if (it.getReferencedNameElementType() != KtTokens.IDENTIFIER) return@registerMultiProvider emptyArray()
 
                 when (it.readWriteAccess(useResolveForReadWrite = false)) {
@@ -41,31 +41,31 @@ public class KotlinReferenceContributor() : PsiReferenceContributor() {
                 }
             }
 
-            registerProvider(javaClass<KtConstructorDelegationReferenceExpression>()) {
+            registerProvider(KtConstructorDelegationReferenceExpression::class.java) {
                 KtConstructorDelegationReference(it)
             }
 
-            registerProvider(javaClass<KtCallExpression>()) {
+            registerProvider(KtCallExpression::class.java) {
                 KtInvokeFunctionReference(it)
             }
 
-            registerProvider(javaClass<KtArrayAccessExpression>()) {
+            registerProvider(KtArrayAccessExpression::class.java) {
                 KtArrayAccessReference(it)
             }
 
-            registerProvider(javaClass<KtForExpression>()) {
+            registerProvider(KtForExpression::class.java) {
                 KtForLoopInReference(it)
             }
 
-            registerProvider(javaClass<KtPropertyDelegate>()) {
+            registerProvider(KtPropertyDelegate::class.java) {
                 KtPropertyDelegationMethodsReference(it)
             }
 
-            registerProvider(javaClass<KtDestructuringDeclaration>()) {
+            registerProvider(KtDestructuringDeclaration::class.java) {
                 KtDestructuringDeclarationReference(it)
             }
 
-            registerProvider(javaClass<KDocName>()) {
+            registerProvider(KDocName::class.java) {
                 KDocReference(it)
             }
         }
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/KtReference.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/KtReference.kt
index 2916df2cfbd..c91e0351e68 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/KtReference.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/KtReference.kt
@@ -48,7 +48,7 @@ public abstract class AbstractKtReference<T : KtElement>(element: T)
 
     override fun resolve(): PsiElement? {
         val psiElements = resolveToPsiElements()
-        if (psiElements.size() == 1) {
+        if (psiElements.size == 1) {
             return psiElements.iterator().next()
         }
         return null
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/KtSimpleNameReference.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/KtSimpleNameReference.kt
index 74e605e3f74..889689b11de 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/KtSimpleNameReference.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/KtSimpleNameReference.kt
@@ -159,7 +159,7 @@ class KtSimpleNameReference(expression: KtSimpleNameExpression) : KtSimpleRefere
         if (shorteningMode == ShorteningMode.NO_SHORTENING) return newExpression
 
         val needToShorten =
-                PsiTreeUtil.getParentOfType(expression, javaClass<KtImportDirective>(), javaClass<KtPackageDirective>()) == null
+                PsiTreeUtil.getParentOfType(expression, KtImportDirective::class.java, KtPackageDirective::class.java) == null
         if (needToShorten) {
             if (shorteningMode == ShorteningMode.FORCED_SHORTENING) {
                 ShortenReferences.DEFAULT.process(newQualifiedElement)
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/referenceUtil.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/referenceUtil.kt
index 0cefed9b380..adc0d4536f4 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/referenceUtil.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/referenceUtil.kt
@@ -101,7 +101,7 @@ public fun PsiReference.matchesTarget(candidateTarget: PsiElement): Boolean {
         }
         if ((parent as? PsiNewExpression)?.resolveConstructor()?.unwrapped == unwrappedCandidate) return true
     }
-    if (this is PsiJavaCodeReferenceElement && candidateTarget is KtObjectDeclaration && unwrappedTargets.size() == 1) {
+    if (this is PsiJavaCodeReferenceElement && candidateTarget is KtObjectDeclaration && unwrappedTargets.size == 1) {
         val referredClass = unwrappedTargets.first()
         if (referredClass is KtClass && candidateTarget in referredClass.getCompanionObjects()) {
             if (getParent() is PsiImportStaticStatement) return true
@@ -173,7 +173,7 @@ public fun KtExpression.readWriteAccess(useResolveForReadWrite: Boolean): Refere
                 val bindingContext = assignment.analyze(BodyResolveMode.PARTIAL)
                 val resolvedCall = assignment.getResolvedCall(bindingContext) ?: return ReferenceAccess.READ_WRITE
                 if (!resolvedCall.isReallySuccess()) return ReferenceAccess.READ_WRITE
-                return if (resolvedCall.resultingDescriptor.name in OperatorConventions.ASSIGNMENT_OPERATIONS.values())
+                return if (resolvedCall.resultingDescriptor.name in OperatorConventions.ASSIGNMENT_OPERATIONS.values)
                     ReferenceAccess.READ
                 else
                     ReferenceAccess.READ_WRITE
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/KotlinIndexPatternBuilder.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/KotlinIndexPatternBuilder.kt
index e0bb0b8b857..81841ea4ac4 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/KotlinIndexPatternBuilder.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/KotlinIndexPatternBuilder.kt
@@ -40,7 +40,7 @@ public class KotlinIndexPatternBuilder: IndexPatternBuilder {
     override fun getCommentStartDelta(tokenType: IElementType?): Int = 0
 
     override fun getCommentEndDelta(tokenType: IElementType?): Int = when(tokenType) {
-        KtTokens.BLOCK_COMMENT -> "*/".length()
+        KtTokens.BLOCK_COMMENT -> "*/".length
         else -> 0
     }
 }
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/KotlinIndexers.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/KotlinIndexers.kt
index ce85c000511..afa4589b2c4 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/KotlinIndexers.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/KotlinIndexers.kt
@@ -86,7 +86,7 @@ class KotlinFilterLexer(private val occurrenceConsumer: OccurrenceConsumer): Bas
         }
 
         if (tokenType != TokenType.WHITE_SPACE && tokenType !in commentTokens) {
-            if (prevTokens.size() == MAX_PREV_TOKENS) {
+            if (prevTokens.size == MAX_PREV_TOKENS) {
                 prevTokens.removeLast()
             }
             prevTokens.addFirst(tokenType)
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/declarationsSearch/overridersSearch.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/declarationsSearch/overridersSearch.kt
index 851d5302d98..1f23e56f904 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/declarationsSearch/overridersSearch.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/declarationsSearch/overridersSearch.kt
@@ -83,7 +83,7 @@ public object KotlinPsiMethodOverridersSearch : HierarchySearch<PsiMethod>(PsiMe
             }
         }
 
-        return classToMethod.values()
+        return classToMethod.values
     }
 
     override fun isApplicable(request: HierarchySearchRequest<PsiMethod>): Boolean =
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/conventions.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/conventions.kt
index 80f43b6dcf0..5ffbb378215 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/conventions.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/conventions.kt
@@ -27,9 +27,9 @@ import org.jetbrains.kotlin.util.OperatorNameConventions
 
 public val ALL_SEARCHABLE_OPERATIONS: ImmutableSet<KtToken> = ImmutableSet
         .builder<KtToken>()
-        .addAll(UNARY_OPERATION_NAMES.keySet())
-        .addAll(BINARY_OPERATION_NAMES.keySet())
-        .addAll(ASSIGNMENT_OPERATIONS.keySet())
+        .addAll(UNARY_OPERATION_NAMES.keys)
+        .addAll(BINARY_OPERATION_NAMES.keys)
+        .addAll(ASSIGNMENT_OPERATIONS.keys)
         .addAll(COMPARISON_OPERATIONS)
         .addAll(EQUALS_OPERATIONS)
         .addAll(IDENTITY_EQUALS_OPERATIONS)
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/IndexUtils.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/IndexUtils.kt
index a769aaf696b..1568e413e59 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/IndexUtils.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/IndexUtils.kt
@@ -59,7 +59,7 @@ private fun <TDeclaration : KtCallableDeclaration> KtTypeElement.index(declarati
         is KtNullableType -> getInnerType()?.index(declaration, sink)
 
         is KtFunctionType -> {
-            val arity = getParameters().size() + (if (getReceiverTypeReference() != null) 1 else 0)
+            val arity = getParameters().size + (if (getReceiverTypeReference() != null) 1 else 0)
             occurrence("Function$arity")
         }
 
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinTopLevelExtensionsByReceiverTypeIndex.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinTopLevelExtensionsByReceiverTypeIndex.kt
index 2102d7b4009..2a65659f561 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinTopLevelExtensionsByReceiverTypeIndex.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinTopLevelExtensionsByReceiverTypeIndex.kt
@@ -29,7 +29,7 @@ public class KotlinTopLevelExtensionsByReceiverTypeIndex private constructor() :
             = super.get(s, project, KotlinSourceFilterScope.sourcesAndLibraries(scope, project))
 
     companion object {
-        private val KEY = KotlinIndexUtil.createIndexKey<String, KtCallableDeclaration>(javaClass<KotlinTopLevelExtensionsByReceiverTypeIndex>())
+        private val KEY = KotlinIndexUtil.createIndexKey<String, KtCallableDeclaration>(KotlinTopLevelExtensionsByReceiverTypeIndex::class.java)
         private val SEPARATOR = '\n'
 
         public val INSTANCE: KotlinTopLevelExtensionsByReceiverTypeIndex = KotlinTopLevelExtensionsByReceiverTypeIndex()
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/PackageIndexUtil.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/PackageIndexUtil.kt
index 41e29ed90e6..599c58ce700 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/PackageIndexUtil.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/PackageIndexUtil.kt
@@ -66,7 +66,7 @@ public object PackageIndexUtil {
     ): Boolean {
         var result = false
         StubIndex.getInstance().processElements<String, KtFile>(
-                KotlinExactPackagesIndex.getInstance().getKey(), packageFqName.asString(), project, searchScope, javaClass<KtFile>()
+                KotlinExactPackagesIndex.getInstance().getKey(), packageFqName.asString(), project, searchScope, KtFile::class.java
         ) {
             result = true
             false
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/SubpackagesIndexService.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/SubpackagesIndexService.kt
index 788d3a06528..6b3fe37d587 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/SubpackagesIndexService.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/SubpackagesIndexService.kt
@@ -67,7 +67,7 @@ public class SubpackagesIndexService(private val project: Project) {
         fun getSubpackages(fqName: FqName, scope: GlobalSearchScope, nameFilter: (Name) -> Boolean): Collection<FqName> {
             val possibleFilesFqNames = fqNameByPrefix[fqName]
             val existingSubPackagesShortNames = HashSet<Name>()
-            val len = fqName.pathSegments().size()
+            val len = fqName.pathSegments().size
             for (filesFqName in possibleFilesFqNames) {
                 val candidateSubPackageShortName = filesFqName.pathSegments()[len]
                 if (candidateSubPackageShortName in existingSubPackagesShortNames || !nameFilter(candidateSubPackageShortName)) continue
@@ -84,7 +84,7 @@ public class SubpackagesIndexService(private val project: Project) {
 
     companion object {
         public fun getInstance(project: Project): SubpackagesIndex {
-            return ServiceManager.getService(project, javaClass<SubpackagesIndexService>())!!.cachedValue.getValue()!!
+            return ServiceManager.getService(project, SubpackagesIndexService::class.java)!!.cachedValue.getValue()!!
         }
     }
 }
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ImportInsertHelper.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ImportInsertHelper.kt
index 47b3fab2c3d..0da6d45100e 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ImportInsertHelper.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ImportInsertHelper.kt
@@ -36,7 +36,7 @@ abstract class ImportInsertHelper {
     companion object {
         @JvmStatic
         public fun getInstance(project: Project): ImportInsertHelper
-            = ServiceManager.getService<ImportInsertHelper>(project, javaClass<ImportInsertHelper>())
+            = ServiceManager.getService<ImportInsertHelper>(project, ImportInsertHelper::class.java)
     }
 }
 
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/PsiPrecedences.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/PsiPrecedences.kt
index 746a11eb933..049bf6ea289 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/PsiPrecedences.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/PsiPrecedences.kt
@@ -26,7 +26,7 @@ import java.util.*
 
 public object PsiPrecedences {
 
-    private val LOG = Logger.getInstance(javaClass<PsiPrecedences>())
+    private val LOG = Logger.getInstance(PsiPrecedences::class.java)
 
     private val precedence: Map<IElementType, Int>
     init {
@@ -40,8 +40,8 @@ public object PsiPrecedences {
     }
 
     public val PRECEDENCE_OF_ATOMIC_EXPRESSION: Int = -1
-    public val PRECEDENCE_OF_PREFIX_EXPRESSION: Int = PREFIX.ordinal()
-    public val PRECEDENCE_OF_POSTFIX_EXPRESSION: Int = POSTFIX.ordinal()
+    public val PRECEDENCE_OF_PREFIX_EXPRESSION: Int = PREFIX.ordinal
+    public val PRECEDENCE_OF_POSTFIX_EXPRESSION: Int = POSTFIX.ordinal
 
     public fun getPrecedence(expression: KtExpression): Int {
         return when (expression) {
@@ -54,7 +54,7 @@ public object PsiPrecedences {
                 val precedenceNumber = precedence[operation]
                 if (precedenceNumber == null) {
                     LOG.error("No precedence for operation: " + operation)
-                    precedence.size()
+                    precedence.size
                 }
                 else precedenceNumber
             }
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ShortenReferences.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ShortenReferences.kt
index 7d06d02ffac..3434aa6078b 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ShortenReferences.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ShortenReferences.kt
@@ -176,7 +176,7 @@ public class ShortenReferences(val options: (KtElement) -> Options = { Options.D
 
     private fun dropNestedElements(elements: List<KtElement>): LinkedHashSet<KtElement> {
         val elementSet = elements.toSet()
-        val newElements = LinkedHashSet<KtElement>(elementSet.size())
+        val newElements = LinkedHashSet<KtElement>(elementSet.size)
         for (element in elementSet) {
             if (!element.parents.any { it in elementSet }) {
                 newElements.add(element)
@@ -337,7 +337,7 @@ public class ShortenReferences(val options: (KtElement) -> Options = { Options.D
 
             if (PsiTreeUtil.getParentOfType(
                     qualifiedExpression,
-                    javaClass<KtImportDirective>(), javaClass<KtPackageDirective>()) != null) return true
+                    KtImportDirective::class.java, KtPackageDirective::class.java) != null) return true
 
             val selector = qualifiedExpression.getSelectorExpression() ?: return false
             val callee = selector.getCalleeExpressionIfAny() as? KtReferenceExpression ?: return false
@@ -441,7 +441,7 @@ public class ShortenReferences(val options: (KtElement) -> Options = { Options.D
 
             if (PsiTreeUtil.getParentOfType(
                     qualifiedExpression,
-                    javaClass<KtImportDirective>(), javaClass<KtPackageDirective>()) != null) return false
+                    KtImportDirective::class.java, KtPackageDirective::class.java) != null) return false
 
             val receiverTarget = receiver.singleTarget(bindingContext) ?: return false
             if (receiverTarget !is ClassDescriptor) return false
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/vfilefinder/IDEVirtualFileFinder.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/vfilefinder/IDEVirtualFileFinder.kt
index ef6b176e580..26191579f9e 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/vfilefinder/IDEVirtualFileFinder.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/vfilefinder/IDEVirtualFileFinder.kt
@@ -38,8 +38,8 @@ public class IDEVirtualFileFinder(private val scope: GlobalSearchScope) : Virtua
         val files = FileBasedIndex.getInstance().getContainingFiles<FqName, Void>(key, classId.asSingleFqName(), scope)
         if (files.isEmpty()) return null
 
-        if (files.size() > 1) {
-            LOG.warn("There are " + files.size() + " classes with same fqName: " + classId + " found.")
+        if (files.size > 1) {
+            LOG.warn("There are " + files.size + " classes with same fqName: " + classId + " found.")
         }
         return files.iterator().next()
     }
@@ -47,6 +47,6 @@ public class IDEVirtualFileFinder(private val scope: GlobalSearchScope) : Virtua
     override fun findVirtualFileWithHeader(classId: ClassId): VirtualFile? = findVirtualFileWithHeader(classId, KotlinClassFileIndex.KEY)
 
     companion object {
-        private val LOG = Logger.getInstance(javaClass<IDEVirtualFileFinder>())
+        private val LOG = Logger.getInstance(IDEVirtualFileFinder::class.java)
     }
 }
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/vfilefinder/JsVirtualFileFinder.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/vfilefinder/JsVirtualFileFinder.kt
index c164ee2b99f..7b7476a770a 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/vfilefinder/JsVirtualFileFinder.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/vfilefinder/JsVirtualFileFinder.kt
@@ -25,6 +25,6 @@ public interface JsVirtualFileFinder : VirtualFileFinder {
     public object SERVICE {
         @JvmStatic
         public fun getInstance(project: Project): JsVirtualFileFinder =
-            ServiceManager.getService(project, javaClass<JsVirtualFileFinderFactory>()).create(GlobalSearchScope.allScope(project))
+            ServiceManager.getService(project, JsVirtualFileFinderFactory::class.java).create(GlobalSearchScope.allScope(project))
     }
 }
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/vfilefinder/JsVirtualFileFinderFactory.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/vfilefinder/JsVirtualFileFinderFactory.kt
index 6d587bc9578..ee591affc5e 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/vfilefinder/JsVirtualFileFinderFactory.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/vfilefinder/JsVirtualFileFinderFactory.kt
@@ -27,6 +27,6 @@ public interface JsVirtualFileFinderFactory : VirtualFileFinderFactory {
     public object SERVICE {
         @JvmStatic
         public fun getInstance(project: Project): JsVirtualFileFinderFactory =
-                ServiceManager.getService(project, javaClass<JsVirtualFileFinderFactory>())
+                ServiceManager.getService(project, JsVirtualFileFinderFactory::class.java)
     }
 }
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/vfilefinder/fileFinders.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/vfilefinder/fileFinders.kt
index d584d1a728d..98d3aa905a5 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/vfilefinder/fileFinders.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/vfilefinder/fileFinders.kt
@@ -37,8 +37,8 @@ private fun findVirtualFileWithHeader(classId: ClassId, key: ID<FqName, Void>, s
     val files = FileBasedIndex.getInstance().getContainingFiles<FqName, Void>(key, classId.asSingleFqName(), scope)
     if (files.isEmpty()) return null
 
-    if (files.size() > 1) {
-        logger.warn("There are " + files.size() + " classes with same fqName: " + classId + " found.")
+    if (files.size > 1) {
+        logger.warn("There are " + files.size + " classes with same fqName: " + classId + " found.")
     }
     return files.iterator().next()
 }
@@ -51,7 +51,7 @@ public class JsIDEVirtualFileFinder(private val scope: GlobalSearchScope) : JsVi
             findVirtualFileWithHeader(classId, KotlinJavaScriptMetaFileIndex.KEY, scope, LOG)
 
     companion object {
-        private val LOG = Logger.getInstance(javaClass<JsIDEVirtualFileFinder>())
+        private val LOG = Logger.getInstance(JsIDEVirtualFileFinder::class.java)
     }
 }
 
@@ -63,7 +63,7 @@ public class JvmIDEVirtualFileFinder(private val scope: GlobalSearchScope) : Vir
             findVirtualFileWithHeader(classId, KotlinClassFileIndex.KEY, scope, LOG)
 
     companion object {
-        private val LOG = Logger.getInstance(javaClass<JvmIDEVirtualFileFinder>())
+        private val LOG = Logger.getInstance(JvmIDEVirtualFileFinder::class.java)
     }
 }
 
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/vfilefinder/moduleMappingIndexes.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/vfilefinder/moduleMappingIndexes.kt
index ae013f82801..d390558d650 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/vfilefinder/moduleMappingIndexes.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/vfilefinder/moduleMappingIndexes.kt
@@ -27,7 +27,7 @@ import java.io.DataOutput
 
 public object KotlinModuleMappingIndex : FileBasedIndexExtension<String, PackageParts>() {
 
-    private val classOfIndex = javaClass<KotlinModuleMappingIndex>().getCanonicalName()
+    private val classOfIndex = KotlinModuleMappingIndex::class.java.getCanonicalName()
 
     public val KEY: ID<String, PackageParts> = ID.create(classOfIndex)
 
@@ -55,7 +55,7 @@ public object KotlinModuleMappingIndex : FileBasedIndexExtension<String, Package
 
         override fun save(out: DataOutput, value: PackageParts?) {
             out.writeUTF(value!!.packageFqName)
-            out.writeInt(value.parts.size())
+            out.writeInt(value.parts.size)
             value.parts.forEach { out.writeUTF(it) }
         }
     }