diff --git a/nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/postProcessing/J2kPostProcessor.kt b/nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/postProcessing/J2kPostProcessor.kt
index dab7e8c6755..d05fee8fb7b 100644
--- a/nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/postProcessing/J2kPostProcessor.kt
+++ b/nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/postProcessing/J2kPostProcessor.kt
@@ -274,13 +274,6 @@ private val processings: List<NamedPostProcessingGroup> = listOf(
             ClearUnknownLabelsProcessing()
         )
     ),
-    NamedPostProcessingGroup(
-        "Formatting code",
-        listOf(
-            FormatCodeProcessing(),
-            ShortenReferenceProcessing()
-        )
-    ),
     NamedPostProcessingGroup(
         "Cleaning up code",
         listOf(
@@ -301,10 +294,10 @@ private val processings: List<NamedPostProcessingGroup> = listOf(
         )
     ),
     NamedPostProcessingGroup(
-        "Optimizing imports",
+        "Optimizing imports and formatting code",
         listOf(
-            OptimizeImportsProcessing(),
             ShortenReferenceProcessing(),
+            OptimizeImportsProcessing(),
             FormatCodeProcessing()
         )
     )
diff --git a/nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/postProcessing/processings/ConvertGettersAndSettersToPropertyProcessing.kt b/nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/postProcessing/processings/ConvertGettersAndSettersToPropertyProcessing.kt
index 755ca3693db..b55cdb33498 100644
--- a/nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/postProcessing/processings/ConvertGettersAndSettersToPropertyProcessing.kt
+++ b/nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/postProcessing/processings/ConvertGettersAndSettersToPropertyProcessing.kt
@@ -263,10 +263,11 @@ private class ConvertGettersAndSettersToPropertyStatefulProcessing(
 
     private fun KtExpression.isReferenceToThis() =
         when (this) {
-            is KtThisExpression -> instanceReference.resolve() == getStrictParentOfType<KtClassOrObject>()
-            is KtReferenceExpression -> resolve() == getStrictParentOfType<KtClassOrObject>()
-            else -> false
-        }
+            is KtThisExpression -> instanceReference
+            is KtReferenceExpression -> this
+            is KtQualifiedExpression -> selectorExpression as? KtReferenceExpression
+            else -> null
+        }?.resolve() == getStrictParentOfType<KtClassOrObject>()
 
     private fun KtElement.usages(scope: PsiElement? = null) =
         searcher.search(this, scope)
diff --git a/nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/postProcessing/utils.kt b/nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/postProcessing/utils.kt
index adf7ed96831..d77311bc341 100644
--- a/nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/postProcessing/utils.kt
+++ b/nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/postProcessing/utils.kt
@@ -19,14 +19,13 @@ import org.jetbrains.kotlin.idea.references.KtSimpleNameReference
 import org.jetbrains.kotlin.idea.references.mainReference
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.psi.psiUtil.collectDescendantsOfType
+import org.jetbrains.kotlin.psi.psiUtil.getPossiblyQualifiedCallExpression
 import org.jetbrains.kotlin.psi.psiUtil.isAncestor
 
 
 fun KtExpression.unpackedReferenceToProperty(): KtProperty? =
     when (this) {
-        is KtDotQualifiedExpression ->
-            if (receiverExpression is KtThisExpression) selectorExpression as? KtNameReferenceExpression
-            else null
+        is KtDotQualifiedExpression -> selectorExpression as? KtNameReferenceExpression
         is KtNameReferenceExpression -> this
         else -> null
     }?.references
diff --git a/nj2k/testData/multiFile/DetectPropertiesMultipleFiles/B.kt b/nj2k/testData/multiFile/DetectPropertiesMultipleFiles/B.kt
index 9cb811d296f..7f910299523 100644
--- a/nj2k/testData/multiFile/DetectPropertiesMultipleFiles/B.kt
+++ b/nj2k/testData/multiFile/DetectPropertiesMultipleFiles/B.kt
@@ -3,15 +3,12 @@ package test
 open class B {
     val fromB1: String
         get() = ""
-
     var fromB2: String?
         get() = ""
         set(value) {}
-
     var fromB3: String?
         get() = ""
         set(value) {}
-
     var fromB4: String?
         get() = ""
         set(value) {}
diff --git a/nj2k/testData/multiFile/DetectPropertiesMultipleFiles/C.kt b/nj2k/testData/multiFile/DetectPropertiesMultipleFiles/C.kt
index 5a6b43abcb1..b2ffdcca68a 100644
--- a/nj2k/testData/multiFile/DetectPropertiesMultipleFiles/C.kt
+++ b/nj2k/testData/multiFile/DetectPropertiesMultipleFiles/C.kt
@@ -2,10 +2,8 @@ package test
 
 abstract class C internal constructor(override val something1: Int) : B(), I {
     private var mySomething6 = 0
-
     override val something2: Int
         get() = 0
-
     override var something3: Int
         get() = 0
         set(value) {}
@@ -30,5 +28,4 @@ abstract class C internal constructor(override val something1: Int) : B(), I {
     override fun setFromB5(value: String?) {
         super.setFromB5(value)
     }
-
 }
\ No newline at end of file
diff --git a/nj2k/testData/multiFile/NullabilityByDFa/SomeServiceUsage.kt b/nj2k/testData/multiFile/NullabilityByDFa/SomeServiceUsage.kt
index bb2f19157b4..a35995987ce 100644
--- a/nj2k/testData/multiFile/NullabilityByDFa/SomeServiceUsage.kt
+++ b/nj2k/testData/multiFile/NullabilityByDFa/SomeServiceUsage.kt
@@ -1,7 +1,6 @@
 class SomeServiceUsage {
     val service: SomeService
         get() = SomeService.getInstanceNotNull()
-
     val serviceNullable: SomeService
         get() = SomeService.getInstanceNullable()
 
diff --git a/nj2k/testData/multiFile/ToCompanionObject/ClassWithStatics.kt b/nj2k/testData/multiFile/ToCompanionObject/ClassWithStatics.kt
index edbb9a9f8be..374cae23c36 100644
--- a/nj2k/testData/multiFile/ToCompanionObject/ClassWithStatics.kt
+++ b/nj2k/testData/multiFile/ToCompanionObject/ClassWithStatics.kt
@@ -10,6 +10,5 @@ internal open class ClassWithStatics {
         @JvmField
         var staticNonFinalField = 1
         var value = 0
-
     }
 }
\ No newline at end of file
diff --git a/nj2k/testData/newJ2k/annotations/annotationsFromPropertyAccessors.kt b/nj2k/testData/newJ2k/annotations/annotationsFromPropertyAccessors.kt
index ed1eb8df756..66e2463cb51 100644
--- a/nj2k/testData/newJ2k/annotations/annotationsFromPropertyAccessors.kt
+++ b/nj2k/testData/newJ2k/annotations/annotationsFromPropertyAccessors.kt
@@ -3,5 +3,4 @@ class Test {
     @get:An(value = "get")
     @set:An(value = "set")
     var id = 0
-
 }
\ No newline at end of file
diff --git a/nj2k/testData/newJ2k/annotations/kt-31726.kt b/nj2k/testData/newJ2k/annotations/kt-31726.kt
index 4a2164ddacb..2f9f707bd89 100644
--- a/nj2k/testData/newJ2k/annotations/kt-31726.kt
+++ b/nj2k/testData/newJ2k/annotations/kt-31726.kt
@@ -2,7 +2,7 @@ import javaApi.SpecialExternal
 
 //Annotation class:
 annotation class Special(val names: Array<String> //array is used
-)  //Class with annotation:
+) //Class with annotation:
 
 @Special(names = ["name1"])
 class JClass
diff --git a/nj2k/testData/newJ2k/comments/commentsForConstructors.kt b/nj2k/testData/newJ2k/comments/commentsForConstructors.kt
index a91b79dc045..af6e758cee3 100644
--- a/nj2k/testData/newJ2k/comments/commentsForConstructors.kt
+++ b/nj2k/testData/newJ2k/comments/commentsForConstructors.kt
@@ -6,24 +6,21 @@ internal class A // this is a primary constructor
 
     // this is a secondary constructor 2
     constructor(s: String) : this(s.length) {} // end of secondary constructor 2 body
-
     // end of secondary constructor 1 body
 }
 
-internal class B // this constructor will disappear
+internal class B     // this constructor will disappear
 // end of constructor body
 (private val x: Int) {
     fun foo() {}
-
 }
 
-internal class CtorComment /*
+internal class CtorComment     /*
      * The magic of comments
      */
 // single line magic comments
 {
     var myA = "a"
-
 }
 
 internal class CtorComment2  /*
diff --git a/nj2k/testData/newJ2k/comments/fieldWithEndOfLineComment2.kt b/nj2k/testData/newJ2k/comments/fieldWithEndOfLineComment2.kt
index 586d345b6cc..6fafd36faba 100644
--- a/nj2k/testData/newJ2k/comments/fieldWithEndOfLineComment2.kt
+++ b/nj2k/testData/newJ2k/comments/fieldWithEndOfLineComment2.kt
@@ -8,5 +8,4 @@ class Foo {
         //some comment 2
         if (state == 2) println("2")
     }
-
 }
\ No newline at end of file
diff --git a/nj2k/testData/newJ2k/constructors/allCallsPrimary2.kt b/nj2k/testData/newJ2k/constructors/allCallsPrimary2.kt
index f7edc09d2e2..6d399c907a9 100644
--- a/nj2k/testData/newJ2k/constructors/allCallsPrimary2.kt
+++ b/nj2k/testData/newJ2k/constructors/allCallsPrimary2.kt
@@ -11,7 +11,6 @@ internal class C(val myArg1: Int) {
         myArg2 = arg2
         myArg3 = 0
     }
-
 }
 
 object User {
diff --git a/nj2k/testData/newJ2k/constructors/constructorAnnotations.kt b/nj2k/testData/newJ2k/constructors/constructorAnnotations.kt
index 5dadf377acc..612f726196e 100644
--- a/nj2k/testData/newJ2k/constructors/constructorAnnotations.kt
+++ b/nj2k/testData/newJ2k/constructors/constructorAnnotations.kt
@@ -1,13 +1,11 @@
 import javaApi.Anon5
 
 internal class A @Anon5(10) constructor(private val a: Int, private val b: Int) {
-
     // this constructor will not be replaced by default parameter value in primary because of this annotation
     @Deprecated("")
     constructor(a: Int) : this(a, 1) {
     }
-
 }
 
 internal class B @Anon5(11) constructor()
-internal class C @Anon5(12) private constructor() 
\ No newline at end of file
+internal class C @Anon5(12) private constructor()
\ No newline at end of file
diff --git a/nj2k/testData/newJ2k/constructors/fieldsInitializedFromParams2.kt b/nj2k/testData/newJ2k/constructors/fieldsInitializedFromParams2.kt
index c5d8f3ae4a9..22d00e76aa7 100644
--- a/nj2k/testData/newJ2k/constructors/fieldsInitializedFromParams2.kt
+++ b/nj2k/testData/newJ2k/constructors/fieldsInitializedFromParams2.kt
@@ -1,5 +1,4 @@
 internal class C(private val field: Int) {
-
     init {
         println(field)
     }
diff --git a/nj2k/testData/newJ2k/constructors/genericIdentifier.kt b/nj2k/testData/newJ2k/constructors/genericIdentifier.kt
index 19f8d4ff6d3..73f23f53eaf 100644
--- a/nj2k/testData/newJ2k/constructors/genericIdentifier.kt
+++ b/nj2k/testData/newJ2k/constructors/genericIdentifier.kt
@@ -17,7 +17,6 @@ class Identifier<T> {
         myHasDollar = hasDollar
         myNullable = isNullable
     }
-
 }
 
 object User {
diff --git a/nj2k/testData/newJ2k/constructors/identifier.kt b/nj2k/testData/newJ2k/constructors/identifier.kt
index 9e095285563..c663b1475ee 100644
--- a/nj2k/testData/newJ2k/constructors/identifier.kt
+++ b/nj2k/testData/newJ2k/constructors/identifier.kt
@@ -17,7 +17,6 @@ class Identifier {
         myHasDollar = hasDollar
         myNullable = isNullable
     }
-
 }
 
 object User {
diff --git a/nj2k/testData/newJ2k/constructors/methodCallInFactoryFun.kt b/nj2k/testData/newJ2k/constructors/methodCallInFactoryFun.kt
index 54e18e55c4e..d6c323c596c 100644
--- a/nj2k/testData/newJ2k/constructors/methodCallInFactoryFun.kt
+++ b/nj2k/testData/newJ2k/constructors/methodCallInFactoryFun.kt
@@ -16,5 +16,4 @@ internal class C(private val arg1: Int, private val arg2: Int, private val arg3:
             return 0
         }
     }
-
 }
\ No newline at end of file
diff --git a/nj2k/testData/newJ2k/constructors/qualifiedRefInFactoryFun.kt b/nj2k/testData/newJ2k/constructors/qualifiedRefInFactoryFun.kt
index 9c39f654620..969c1b2a319 100644
--- a/nj2k/testData/newJ2k/constructors/qualifiedRefInFactoryFun.kt
+++ b/nj2k/testData/newJ2k/constructors/qualifiedRefInFactoryFun.kt
@@ -1,9 +1,7 @@
 internal class C(private val arg1: Int, private val arg2: Int, private val arg3: Int) {
-
     constructor(arg1: Int, arg2: Int, other: C) : this(arg1, arg2, 0) {
         println(this.arg1 + other.arg2)
     }
-
 }
 
 internal class User {
diff --git a/nj2k/testData/newJ2k/detectProperties/AssignFieldInsideSetter.kt b/nj2k/testData/newJ2k/detectProperties/AssignFieldInsideSetter.kt
index 2f7a79e84c1..7ec86a5ee26 100644
--- a/nj2k/testData/newJ2k/detectProperties/AssignFieldInsideSetter.kt
+++ b/nj2k/testData/newJ2k/detectProperties/AssignFieldInsideSetter.kt
@@ -1,4 +1,3 @@
 class C {
     var x: String? = null
-
 }
\ No newline at end of file
diff --git a/nj2k/testData/newJ2k/detectProperties/Comments.kt b/nj2k/testData/newJ2k/detectProperties/Comments.kt
index 391e2f649fa..6d5c56bf805 100644
--- a/nj2k/testData/newJ2k/detectProperties/Comments.kt
+++ b/nj2k/testData/newJ2k/detectProperties/Comments.kt
@@ -1,4 +1,4 @@
-internal class A(// comment for field2 setter
+internal class A(  // comment for field2 setter
         // comment for field2 getter
         var field2 // comment for field2
         : Int) {
diff --git a/nj2k/testData/newJ2k/detectProperties/DataClassWithMutableField.kt b/nj2k/testData/newJ2k/detectProperties/DataClassWithMutableField.kt
index 0b71fc16925..8f0b871df5e 100644
--- a/nj2k/testData/newJ2k/detectProperties/DataClassWithMutableField.kt
+++ b/nj2k/testData/newJ2k/detectProperties/DataClassWithMutableField.kt
@@ -3,5 +3,4 @@ class Test(var count: Int) {
     fun inc() {
         count++
     }
-
 }
\ No newline at end of file
diff --git a/nj2k/testData/newJ2k/detectProperties/DropGetterAndSetter.kt b/nj2k/testData/newJ2k/detectProperties/DropGetterAndSetter.kt
index 52675c6b81d..ad6a89cc3e5 100644
--- a/nj2k/testData/newJ2k/detectProperties/DropGetterAndSetter.kt
+++ b/nj2k/testData/newJ2k/detectProperties/DropGetterAndSetter.kt
@@ -1,4 +1,3 @@
 class AAA {
     var x = 42
-
 }
\ No newline at end of file
diff --git a/nj2k/testData/newJ2k/detectProperties/FalseSetter.kt b/nj2k/testData/newJ2k/detectProperties/FalseSetter.kt
index 06b157fe242..a6bc4bbd512 100644
--- a/nj2k/testData/newJ2k/detectProperties/FalseSetter.kt
+++ b/nj2k/testData/newJ2k/detectProperties/FalseSetter.kt
@@ -3,5 +3,4 @@ class AAA {
         set(x) {
             field += x
         }
-
 }
\ No newline at end of file
diff --git a/nj2k/testData/newJ2k/detectProperties/GetterWithSideEffect4.kt b/nj2k/testData/newJ2k/detectProperties/GetterWithSideEffect4.kt
index b85560fe77b..c3fbf67c54a 100644
--- a/nj2k/testData/newJ2k/detectProperties/GetterWithSideEffect4.kt
+++ b/nj2k/testData/newJ2k/detectProperties/GetterWithSideEffect4.kt
@@ -4,5 +4,4 @@ class C {
             println("getter invoked")
             return field
         }
-
 }
\ No newline at end of file
diff --git a/nj2k/testData/newJ2k/detectProperties/GetterWithSideEffect5.kt b/nj2k/testData/newJ2k/detectProperties/GetterWithSideEffect5.kt
index b85560fe77b..c3fbf67c54a 100644
--- a/nj2k/testData/newJ2k/detectProperties/GetterWithSideEffect5.kt
+++ b/nj2k/testData/newJ2k/detectProperties/GetterWithSideEffect5.kt
@@ -4,5 +4,4 @@ class C {
             println("getter invoked")
             return field
         }
-
 }
\ No newline at end of file
diff --git a/nj2k/testData/newJ2k/detectProperties/InCompanionObject.kt b/nj2k/testData/newJ2k/detectProperties/InCompanionObject.kt
index d0f20867ad2..4bdc768e14c 100644
--- a/nj2k/testData/newJ2k/detectProperties/InCompanionObject.kt
+++ b/nj2k/testData/newJ2k/detectProperties/InCompanionObject.kt
@@ -5,6 +5,5 @@ class AAA {
 
     companion object {
         var x = 42
-
     }
 }
\ No newline at end of file
diff --git a/nj2k/testData/newJ2k/detectProperties/InObject.kt b/nj2k/testData/newJ2k/detectProperties/InObject.kt
index 02018283dac..d5249f0cb58 100644
--- a/nj2k/testData/newJ2k/detectProperties/InObject.kt
+++ b/nj2k/testData/newJ2k/detectProperties/InObject.kt
@@ -5,7 +5,6 @@ object AAA {
         set(z) {
             Other.z = z
         }
-
 }
 
 internal object Other {
diff --git a/nj2k/testData/newJ2k/detectProperties/Overrides.kt b/nj2k/testData/newJ2k/detectProperties/Overrides.kt
index b993f68c8cd..59cd88add9c 100644
--- a/nj2k/testData/newJ2k/detectProperties/Overrides.kt
+++ b/nj2k/testData/newJ2k/detectProperties/Overrides.kt
@@ -18,15 +18,12 @@ internal interface I1 : I {
 internal open class B {
     open val fromB1: String
         get() = ""
-
     open var fromB2: String?
         get() = ""
         set(value) {}
-
     open var fromB3: String?
         get() = ""
         set(value) {}
-
     open var fromB4: String?
         get() = ""
         set(value) {}
@@ -36,10 +33,8 @@ internal open class B {
 
 internal abstract class C(override val something1: Int) : B(), I {
     private var mySomething6 = 0
-
     override val something2: Int
         get() = 0
-
     override var something3: Int
         get() = 0
         set(value) {}
@@ -59,19 +54,16 @@ internal abstract class C(override val something1: Int) : B(), I {
 
     override val fromB1: String
         get() = super.fromB1
-
     override var fromB2: String?
         get() = super.fromB2
         set(value) {
             super.fromB2 = value
         }
-
     override var fromB3: String?
         get() = super.fromB3
         set(fromB3) {
             super.fromB3 = fromB3
         }
-
     override var fromB4: String?
         get() = super.fromB4
         set(value) {
@@ -85,5 +77,4 @@ internal abstract class C(override val something1: Int) : B(), I {
     override fun setFromB5(value: String?) {
         super.setFromB5(value)
     }
-
 }
\ No newline at end of file
diff --git a/nj2k/testData/newJ2k/detectProperties/OverridesOfExternalCode.kt b/nj2k/testData/newJ2k/detectProperties/OverridesOfExternalCode.kt
index a98bc4cc224..69b6220c9a8 100644
--- a/nj2k/testData/newJ2k/detectProperties/OverridesOfExternalCode.kt
+++ b/nj2k/testData/newJ2k/detectProperties/OverridesOfExternalCode.kt
@@ -8,25 +8,21 @@ internal open class A : KotlinClassWithProperties() {
         set(s) {
             super.someVar1 = s
         }
-
     override var someVar2: String
         get() = super.someVar2
         set(someVar2) {
             super.someVar2 = someVar2
         }
-
     override var someVar3: String
         get() = super.someVar3
         set(s) {
             super.someVar3 = s
         }
-
     override var someVar4: String
         get() = super.someVar4
         set(someVar4) {
             super.someVar4 = someVar4
         }
-
     override val someVal: String
         get() = super.someVal
 
diff --git a/nj2k/testData/newJ2k/detectProperties/SetterWithSideEffect4.kt b/nj2k/testData/newJ2k/detectProperties/SetterWithSideEffect4.kt
index 83ba7524e2c..4ced9917081 100644
--- a/nj2k/testData/newJ2k/detectProperties/SetterWithSideEffect4.kt
+++ b/nj2k/testData/newJ2k/detectProperties/SetterWithSideEffect4.kt
@@ -4,5 +4,4 @@ class C {
             println("setter invoked")
             field = value
         }
-
 }
\ No newline at end of file
diff --git a/nj2k/testData/newJ2k/detectProperties/SetterWithSideEffect5.kt b/nj2k/testData/newJ2k/detectProperties/SetterWithSideEffect5.kt
index 2ef5b5b1802..a2adae89393 100644
--- a/nj2k/testData/newJ2k/detectProperties/SetterWithSideEffect5.kt
+++ b/nj2k/testData/newJ2k/detectProperties/SetterWithSideEffect5.kt
@@ -4,5 +4,4 @@ class C {
             println("setter invoked")
             field = x
         }
-
 }
\ No newline at end of file
diff --git a/nj2k/testData/newJ2k/detectProperties/SetterWithSideEffect6.kt b/nj2k/testData/newJ2k/detectProperties/SetterWithSideEffect6.kt
index 7c428b01431..71e7664108a 100644
--- a/nj2k/testData/newJ2k/detectProperties/SetterWithSideEffect6.kt
+++ b/nj2k/testData/newJ2k/detectProperties/SetterWithSideEffect6.kt
@@ -4,5 +4,4 @@ class C {
             println("old value: " + this.x)
             field = x
         }
-
 }
\ No newline at end of file
diff --git a/nj2k/testData/newJ2k/detectProperties/commentInInitStatement.kt b/nj2k/testData/newJ2k/detectProperties/commentInInitStatement.kt
index d6a250fae3f..eeb726c94ed 100644
--- a/nj2k/testData/newJ2k/detectProperties/commentInInitStatement.kt
+++ b/nj2k/testData/newJ2k/detectProperties/commentInInitStatement.kt
@@ -1,3 +1,3 @@
-class Nya /*comment before*/
+class Nya     /*comment before*/
 /* comment after*/ // and after again
-(/*1*/ /*3*/  /*4*/private val i: Int)
\ No newline at end of file
+(  /*1*/ /*3*/  /*4*/private val i: Int)
\ No newline at end of file
diff --git a/nj2k/testData/newJ2k/docComments/primaryConstructorDoc.kt b/nj2k/testData/newJ2k/docComments/primaryConstructorDoc.kt
index 0d4f1677c1f..bad98a2aa9c 100644
--- a/nj2k/testData/newJ2k/docComments/primaryConstructorDoc.kt
+++ b/nj2k/testData/newJ2k/docComments/primaryConstructorDoc.kt
@@ -4,7 +4,6 @@ internal class CtorComment
  */
 {
     var myA = "str"
-
 }
 
 internal class CtorComment2
diff --git a/nj2k/testData/newJ2k/enum/constantsWithBody2.kt b/nj2k/testData/newJ2k/enum/constantsWithBody2.kt
index e3be5c80d8e..8019e2563eb 100644
--- a/nj2k/testData/newJ2k/enum/constantsWithBody2.kt
+++ b/nj2k/testData/newJ2k/enum/constantsWithBody2.kt
@@ -11,5 +11,4 @@ enum class E(private val p: Int) {
 
     fun foo(p: Int) {}
     abstract fun bar()
-
 }
\ No newline at end of file
diff --git a/nj2k/testData/newJ2k/identifier/finalFieldReference.kt b/nj2k/testData/newJ2k/identifier/finalFieldReference.kt
index fb640dca49e..8ab31c1c4f2 100644
--- a/nj2k/testData/newJ2k/identifier/finalFieldReference.kt
+++ b/nj2k/testData/newJ2k/identifier/finalFieldReference.kt
@@ -4,5 +4,4 @@ internal class `$$`(val `$$$`: `$$$$$`) : `$`() {
     fun `$$$$$$`(): `$$$$$` {
         return `$$$`
     }
-
 }
\ No newline at end of file
diff --git a/nj2k/testData/newJ2k/issues/kt-19396.kt b/nj2k/testData/newJ2k/issues/kt-19396.kt
index 52864247652..f44c4a4f287 100644
--- a/nj2k/testData/newJ2k/issues/kt-19396.kt
+++ b/nj2k/testData/newJ2k/issues/kt-19396.kt
@@ -6,5 +6,4 @@ class TestValReassign(private val s1: String?) {
     constructor(s1: String?, s2: String?) : this(s1) {
         this.s2 = s2
     }
-
 }
\ No newline at end of file
diff --git a/nj2k/testData/newJ2k/issues/kt-19600.kt b/nj2k/testData/newJ2k/issues/kt-19600.kt
index 2eb60cd11cd..d469e5889af 100644
--- a/nj2k/testData/newJ2k/issues/kt-19600.kt
+++ b/nj2k/testData/newJ2k/issues/kt-19600.kt
@@ -4,5 +4,4 @@ class TestNumberConversionInSetter {
     fun init() {
         d = 1.0
     }
-
-}
+}
\ No newline at end of file
diff --git a/nj2k/testData/newJ2k/issues/kt-5294.kt b/nj2k/testData/newJ2k/issues/kt-5294.kt
index d5baa90f4cd..eaa6045db47 100644
--- a/nj2k/testData/newJ2k/issues/kt-5294.kt
+++ b/nj2k/testData/newJ2k/issues/kt-5294.kt
@@ -1,5 +1,3 @@
 internal class X(private val list: List<Y>) {
-
     internal inner class Y
-
 }
\ No newline at end of file
diff --git a/nj2k/testData/newJ2k/issues/kt-638.kt b/nj2k/testData/newJ2k/issues/kt-638.kt
index e2863fc9fa6..10802b204d6 100644
--- a/nj2k/testData/newJ2k/issues/kt-638.kt
+++ b/nj2k/testData/newJ2k/issues/kt-638.kt
@@ -17,7 +17,6 @@ class Identifier<T> {
         myHasDollar = hasDollar
         myNullable = isNullable
     }
-
 }
 
 object User {
diff --git a/nj2k/testData/newJ2k/issues/kt-836.kt b/nj2k/testData/newJ2k/issues/kt-836.kt
index 367af9dd119..bf68d38f78d 100644
--- a/nj2k/testData/newJ2k/issues/kt-836.kt
+++ b/nj2k/testData/newJ2k/issues/kt-836.kt
@@ -6,7 +6,6 @@ class Language(protected var code: String) : Serializable {
     override fun toString(): String {
         return code
     }
-
 }
 
 internal open class Base {
diff --git a/nj2k/testData/newJ2k/issues/kt-837.kt b/nj2k/testData/newJ2k/issues/kt-837.kt
index 21755fa6483..9a1b8dcb8b0 100644
--- a/nj2k/testData/newJ2k/issues/kt-837.kt
+++ b/nj2k/testData/newJ2k/issues/kt-837.kt
@@ -12,5 +12,4 @@ class Language(protected var code: String) : Serializable {
         var SWEDISH = Language("sv")
         private const val serialVersionUID = -2442762969929206780L
     }
-
 }
\ No newline at end of file
diff --git a/nj2k/testData/newJ2k/nullability/FieldComparedWithNull2.kt b/nj2k/testData/newJ2k/nullability/FieldComparedWithNull2.kt
index bd01fc0bbaa..f9997e15c47 100644
--- a/nj2k/testData/newJ2k/nullability/FieldComparedWithNull2.kt
+++ b/nj2k/testData/newJ2k/nullability/FieldComparedWithNull2.kt
@@ -4,5 +4,4 @@ internal class C(private val s: String?) {
             print("not null")
         }
     }
-
 }
\ No newline at end of file
diff --git a/nj2k/testData/newJ2k/nullability/FieldComparedWithNull4.kt b/nj2k/testData/newJ2k/nullability/FieldComparedWithNull4.kt
index 54b82dfd538..e3ba8f59ae0 100644
--- a/nj2k/testData/newJ2k/nullability/FieldComparedWithNull4.kt
+++ b/nj2k/testData/newJ2k/nullability/FieldComparedWithNull4.kt
@@ -1,5 +1,4 @@
 internal class C(private val s: String?) {
-
     init {
         if (s == null) {
             print("null")
diff --git a/nj2k/testData/newJ2k/overloads/ConflictParameterName.kt b/nj2k/testData/newJ2k/overloads/ConflictParameterName.kt
index 7b6bf72823c..28c23487886 100644
--- a/nj2k/testData/newJ2k/overloads/ConflictParameterName.kt
+++ b/nj2k/testData/newJ2k/overloads/ConflictParameterName.kt
@@ -8,7 +8,6 @@ class Test {
 
     private val isD: Boolean
         private get() = true
-
     private val e = E()
 
     class E {
diff --git a/nj2k/testData/newJ2k/postProcessing/ConvertConcatenationToRawString.kt b/nj2k/testData/newJ2k/postProcessing/ConvertConcatenationToRawString.kt
index 6e2531ccc12..6034a874165 100644
--- a/nj2k/testData/newJ2k/postProcessing/ConvertConcatenationToRawString.kt
+++ b/nj2k/testData/newJ2k/postProcessing/ConvertConcatenationToRawString.kt
@@ -1,7 +1,7 @@
 class Test {
     var s = """
-        asdf
-        nadfadsf
-        asdfasdf
-        """.trimIndent()
+           asdf
+           nadfadsf
+           asdfasdf
+           """.trimIndent()
 }
\ No newline at end of file
diff --git a/nj2k/testData/newJ2k/protected/constructorProperty.kt b/nj2k/testData/newJ2k/protected/constructorProperty.kt
index 2149935825f..f0205c0bebf 100644
--- a/nj2k/testData/newJ2k/protected/constructorProperty.kt
+++ b/nj2k/testData/newJ2k/protected/constructorProperty.kt
@@ -1,7 +1,6 @@
 package test
 
 abstract class Base(protected var field: Int)
-
 class Derived(value: Int) : Base(value) {
     private val usage: View = object : View() {
         override fun click() {
diff --git a/nj2k/testData/newJ2k/settings/specifyLocalVariableTypeByDefaultInFor.kt b/nj2k/testData/newJ2k/settings/specifyLocalVariableTypeByDefaultInFor.kt
index 5d44610363c..3d2d92ac17f 100644
--- a/nj2k/testData/newJ2k/settings/specifyLocalVariableTypeByDefaultInFor.kt
+++ b/nj2k/testData/newJ2k/settings/specifyLocalVariableTypeByDefaultInFor.kt
@@ -1,6 +1,6 @@
 // !specifyLocalVariableTypeByDefault: true
 fun foo(list: List<String?>) {
-    val array = IntArray(10)
+    val array: IntArray = IntArray(10)
     for (i: Int in 0..9) {
         array[i] = i
     }