diff --git a/j2k/src/org/jetbrains/jet/j2k/ast/Class.kt b/j2k/src/org/jetbrains/jet/j2k/ast/Class.kt
index 6d6d9d04ced..ffd5749cb18 100644
--- a/j2k/src/org/jetbrains/jet/j2k/ast/Class.kt
+++ b/j2k/src/org/jetbrains/jet/j2k/ast/Class.kt
@@ -39,9 +39,6 @@ open class Class(
         if (body.primaryConstructorSignature != null) {
             builder.append(body.primaryConstructorSignature)
         }
-        else if (this !is Trait) { //TODO: drop this
-            builder.append("()")
-        }
         appendBaseTypes(builder)
         typeParameterList.appendWhere(builder)
         body.append(builder, this)
diff --git a/j2k/src/org/jetbrains/jet/j2k/ast/Constructors.kt b/j2k/src/org/jetbrains/jet/j2k/ast/Constructors.kt
index ea67ae18eb2..0e73d75b679 100644
--- a/j2k/src/org/jetbrains/jet/j2k/ast/Constructors.kt
+++ b/j2k/src/org/jetbrains/jet/j2k/ast/Constructors.kt
@@ -55,6 +55,7 @@ class PrimaryConstructor(converter: Converter,
 class PrimaryConstructorSignature(val modifiers: Modifiers, val parameterList: ParameterList) : Element() {
     override fun generateCode(builder: CodeBuilder) {
         val accessModifier = modifiers.filter { it in ACCESS_MODIFIERS && it != Modifier.PUBLIC }
+        if (accessModifier.isEmpty && parameterList.parameters.isEmpty()) return
         if (!accessModifier.isEmpty) {
             builder append " " append accessModifier
         }
diff --git a/j2k/tests/test/org/jetbrains/jet/j2k/test/AbstractJavaToKotlinConverterTest.kt b/j2k/tests/test/org/jetbrains/jet/j2k/test/AbstractJavaToKotlinConverterTest.kt
index e058e725af3..9c61398b6d1 100644
--- a/j2k/tests/test/org/jetbrains/jet/j2k/test/AbstractJavaToKotlinConverterTest.kt
+++ b/j2k/tests/test/org/jetbrains/jet/j2k/test/AbstractJavaToKotlinConverterTest.kt
@@ -135,7 +135,7 @@ abstract class AbstractJavaToKotlinConverterTest() : LightIdeaTestCase() {
     }
 
     private fun methodToKotlin(text: String, settings: ConverterSettings, project: Project): String {
-        val result = fileToKotlin("final class C {" + text + "}", settings, project).replaceAll("class C\\(\\) \\{", "")
+        val result = fileToKotlin("final class C {" + text + "}", settings, project).replaceAll("class C \\{", "")
         return result.substring(0, (result.lastIndexOf("}"))).trim()
     }
 
diff --git a/j2k/tests/testData/ast/annotations/annotationUsages.kt b/j2k/tests/testData/ast/annotations/annotationUsages.kt
index 93e135f82af..1ff48460991 100644
--- a/j2k/tests/testData/ast/annotations/annotationUsages.kt
+++ b/j2k/tests/testData/ast/annotations/annotationUsages.kt
@@ -8,7 +8,7 @@ Anon5(1)
 Anon6(array("x", "y"))
 Anon7(javaClass<String>(), javaClass<StringBuilder>())
 Anon8(classes = *array(javaClass<String>(), javaClass<StringBuilder>()))
-class C() {
+class C {
     Anon5(1) deprecated("") private val field1 = 0
 
     Anon5(1)
diff --git a/j2k/tests/testData/ast/annotations/jetbrainsNotNullChainExpr.kt b/j2k/tests/testData/ast/annotations/jetbrainsNotNullChainExpr.kt
index bb3f3622c4f..1bfbd71d7ee 100644
--- a/j2k/tests/testData/ast/annotations/jetbrainsNotNullChainExpr.kt
+++ b/j2k/tests/testData/ast/annotations/jetbrainsNotNullChainExpr.kt
@@ -2,17 +2,17 @@
 // !specifyLocalVariableTypeByDefault: true
 package test
 
-class Foo() {
+class Foo {
     fun execute() {
     }
 }
 
-class Bar() {
+class Bar {
     var fooNotNull = Foo()
     var fooNullable: Foo? = null
 }
 
-class Test() {
+class Test {
     public fun test(barNotNull: Bar, barNullable: Bar?) {
         barNotNull.fooNotNull.execute()
         barNotNull.fooNullable!!.execute()
diff --git a/j2k/tests/testData/ast/anonymousBlock/oneAnonBlock.kt b/j2k/tests/testData/ast/anonymousBlock/oneAnonBlock.kt
index e1e6f1ed90f..7da388fa5ab 100644
--- a/j2k/tests/testData/ast/anonymousBlock/oneAnonBlock.kt
+++ b/j2k/tests/testData/ast/anonymousBlock/oneAnonBlock.kt
@@ -1,4 +1,4 @@
-class Test() {
+class Test {
     var str: String = 0
     {
         str = "Ola"
diff --git a/j2k/tests/testData/ast/anonymousBlock/oneStaticAnonBlock.kt b/j2k/tests/testData/ast/anonymousBlock/oneStaticAnonBlock.kt
index 511ac6c621e..21526e6bb67 100644
--- a/j2k/tests/testData/ast/anonymousBlock/oneStaticAnonBlock.kt
+++ b/j2k/tests/testData/ast/anonymousBlock/oneStaticAnonBlock.kt
@@ -1,4 +1,4 @@
-class Test() {
+class Test {
     var str: String = 0
 
     class object {
diff --git a/j2k/tests/testData/ast/assignmentExpression/nullability-settings.kt b/j2k/tests/testData/ast/assignmentExpression/nullability-settings.kt
index 3aaa5d2de5f..3c0d0453f8f 100644
--- a/j2k/tests/testData/ast/assignmentExpression/nullability-settings.kt
+++ b/j2k/tests/testData/ast/assignmentExpression/nullability-settings.kt
@@ -2,7 +2,7 @@
 // !specifyLocalVariableTypeByDefault: true
 import java.util.BitSet
 
-class Foo() {
+class Foo {
     fun foo(o: BitSet?) {
         val o2: BitSet? = o
         var foo: Int = 0
diff --git a/j2k/tests/testData/ast/assignmentExpression/nullability.kt b/j2k/tests/testData/ast/assignmentExpression/nullability.kt
index d6a50591ecf..26790bf29ec 100644
--- a/j2k/tests/testData/ast/assignmentExpression/nullability.kt
+++ b/j2k/tests/testData/ast/assignmentExpression/nullability.kt
@@ -1,6 +1,6 @@
 import java.util.BitSet
 
-class Foo() {
+class Foo {
     fun foo(o: BitSet) {
         val o2 = o
         var foo = 0
diff --git a/j2k/tests/testData/ast/boxedType/Boxing.kt b/j2k/tests/testData/ast/boxedType/Boxing.kt
index ac902b76658..4e2ae5a91b3 100644
--- a/j2k/tests/testData/ast/boxedType/Boxing.kt
+++ b/j2k/tests/testData/ast/boxedType/Boxing.kt
@@ -1,6 +1,6 @@
 import java.util.ArrayList
 
-class Boxing() {
+class Boxing {
     fun test() {
         var i: Int? = 0
         val n = 0.0.toFloat()
diff --git a/j2k/tests/testData/ast/boxedType/kt-671.kt b/j2k/tests/testData/ast/boxedType/kt-671.kt
index 3cd4711b3ae..d715edffaee 100644
--- a/j2k/tests/testData/ast/boxedType/kt-671.kt
+++ b/j2k/tests/testData/ast/boxedType/kt-671.kt
@@ -1,6 +1,6 @@
 package demo
 
-class Test() {
+class Test {
     fun test() {
         val i = Integer.valueOf(100)
         val s = 3
diff --git a/j2k/tests/testData/ast/callChainExpression/libraryFieldCall.kt b/j2k/tests/testData/ast/callChainExpression/libraryFieldCall.kt
index 3f517922d0c..49e97445436 100644
--- a/j2k/tests/testData/ast/callChainExpression/libraryFieldCall.kt
+++ b/j2k/tests/testData/ast/callChainExpression/libraryFieldCall.kt
@@ -1,10 +1,10 @@
-class Library() {
+class Library {
     class object {
         val ourOut: java.io.PrintStream = 0
     }
 }
 
-class User() {
+class User {
     fun main() {
         Library.ourOut.print()
     }
diff --git a/j2k/tests/testData/ast/callChainExpression/libraryMethodCall.kt b/j2k/tests/testData/ast/callChainExpression/libraryMethodCall.kt
index e4407881c7d..a9c06368ed8 100644
--- a/j2k/tests/testData/ast/callChainExpression/libraryMethodCall.kt
+++ b/j2k/tests/testData/ast/callChainExpression/libraryMethodCall.kt
@@ -1,4 +1,4 @@
-class Library() {
+class Library {
     class object {
         fun call() {
         }
@@ -9,7 +9,7 @@ class Library() {
     }
 }
 
-class User() {
+class User {
     fun main() {
         Library.call()
         Library.getString().isEmpty()
diff --git a/j2k/tests/testData/ast/callChainExpression/libraryMethodCallFromInstance-settings.kt b/j2k/tests/testData/ast/callChainExpression/libraryMethodCallFromInstance-settings.kt
index 4225353cd8f..8e0a26dbf3f 100644
--- a/j2k/tests/testData/ast/callChainExpression/libraryMethodCallFromInstance-settings.kt
+++ b/j2k/tests/testData/ast/callChainExpression/libraryMethodCallFromInstance-settings.kt
@@ -1,6 +1,6 @@
 // !forceNotNullTypes: false
 // !specifyLocalVariableTypeByDefault: true
-class Library() {
+class Library {
     fun call() {
     }
 
@@ -9,7 +9,7 @@ class Library() {
     }
 }
 
-class User() {
+class User {
     fun main() {
         val lib: Library = Library()
         lib.call()
diff --git a/j2k/tests/testData/ast/callChainExpression/libraryMethodCallFromInstance.kt b/j2k/tests/testData/ast/callChainExpression/libraryMethodCallFromInstance.kt
index 8d52a4e5c27..81ea87620ba 100644
--- a/j2k/tests/testData/ast/callChainExpression/libraryMethodCallFromInstance.kt
+++ b/j2k/tests/testData/ast/callChainExpression/libraryMethodCallFromInstance.kt
@@ -1,4 +1,4 @@
-class Library() {
+class Library {
     fun call() {
     }
 
@@ -7,7 +7,7 @@ class Library() {
     }
 }
 
-class User() {
+class User {
     fun main() {
         val lib = Library()
         lib.call()
diff --git a/j2k/tests/testData/ast/callChainExpression/libraryStringFieldCall.kt b/j2k/tests/testData/ast/callChainExpression/libraryStringFieldCall.kt
index 59ec0eff040..84a4b411fc8 100644
--- a/j2k/tests/testData/ast/callChainExpression/libraryStringFieldCall.kt
+++ b/j2k/tests/testData/ast/callChainExpression/libraryStringFieldCall.kt
@@ -1,8 +1,8 @@
-class Library() {
+class Library {
     public val myString: String = 0
 }
 
-class User() {
+class User {
     fun main() {
         Library.myString.isEmpty()
     }
diff --git a/j2k/tests/testData/ast/class/ClassShadowing.kt b/j2k/tests/testData/ast/class/ClassShadowing.kt
index 947af1776a0..a78afd35b70 100644
--- a/j2k/tests/testData/ast/class/ClassShadowing.kt
+++ b/j2k/tests/testData/ast/class/ClassShadowing.kt
@@ -1,6 +1,6 @@
 package test
 
-public class Short() {
+public class Short {
     class object {
         public fun valueOf(value: String): Short {
             return Short()
@@ -8,7 +8,7 @@ public class Short() {
     }
 }
 
-class Test() {
+class Test {
     class object {
         public fun test() {
             test.Short.valueOf("1")
diff --git a/j2k/tests/testData/ast/class/abstractClass.kt b/j2k/tests/testData/ast/class/abstractClass.kt
index 865a601b10a..3df8819901f 100644
--- a/j2k/tests/testData/ast/class/abstractClass.kt
+++ b/j2k/tests/testData/ast/class/abstractClass.kt
@@ -1,4 +1,4 @@
-abstract class A() {
+abstract class A {
     abstract fun callme()
 
     fun callmetoo() {
diff --git a/j2k/tests/testData/ast/class/abstractClassShape.kt b/j2k/tests/testData/ast/class/abstractClassShape.kt
index 52864944fa2..e512bca4f76 100644
--- a/j2k/tests/testData/ast/class/abstractClassShape.kt
+++ b/j2k/tests/testData/ast/class/abstractClassShape.kt
@@ -1,4 +1,4 @@
-abstract class Shape() {
+abstract class Shape {
     public var color: String = 0
     public fun setColor(c: String) {
         color = c
diff --git a/j2k/tests/testData/ast/class/class.kt b/j2k/tests/testData/ast/class/class.kt
index 9eb0d07da4b..f7e70c7b871 100644
--- a/j2k/tests/testData/ast/class/class.kt
+++ b/j2k/tests/testData/ast/class/class.kt
@@ -1 +1 @@
-class Test()
\ No newline at end of file
+class Test
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/class/classWithEmptyMethods.kt b/j2k/tests/testData/ast/class/classWithEmptyMethods.kt
index 34384c82660..44667748eed 100644
--- a/j2k/tests/testData/ast/class/classWithEmptyMethods.kt
+++ b/j2k/tests/testData/ast/class/classWithEmptyMethods.kt
@@ -1,4 +1,4 @@
-class T() {
+class T {
     fun main() {
     }
     fun i(): Int {
diff --git a/j2k/tests/testData/ast/class/classWithFields.kt b/j2k/tests/testData/ast/class/classWithFields.kt
index c562a60dcfa..6b3ba3b8191 100644
--- a/j2k/tests/testData/ast/class/classWithFields.kt
+++ b/j2k/tests/testData/ast/class/classWithFields.kt
@@ -1,4 +1,4 @@
-class T() {
+class T {
     var a = "abc"
     var b = 10
 }
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/class/classWithMultiplyFields.kt b/j2k/tests/testData/ast/class/classWithMultiplyFields.kt
index 48202044e1e..a4cd8c89920 100644
--- a/j2k/tests/testData/ast/class/classWithMultiplyFields.kt
+++ b/j2k/tests/testData/ast/class/classWithMultiplyFields.kt
@@ -1,4 +1,4 @@
-class T() {
+class T {
     var a: String = 0
     var b: String = 0
     var c = "abc"
diff --git a/j2k/tests/testData/ast/class/emptyClass.kt b/j2k/tests/testData/ast/class/emptyClass.kt
index 889a7ca7324..fb7337ede5b 100644
--- a/j2k/tests/testData/ast/class/emptyClass.kt
+++ b/j2k/tests/testData/ast/class/emptyClass.kt
@@ -1 +1 @@
-class A()
\ No newline at end of file
+class A
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/class/extendsOneClassAndImplementsOneInterface.kt b/j2k/tests/testData/ast/class/extendsOneClassAndImplementsOneInterface.kt
index 2fb3570566d..a2bdf3b6fcc 100644
--- a/j2k/tests/testData/ast/class/extendsOneClassAndImplementsOneInterface.kt
+++ b/j2k/tests/testData/ast/class/extendsOneClassAndImplementsOneInterface.kt
@@ -1 +1 @@
-class A() : Base(), I
\ No newline at end of file
+class A : Base(), I
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/class/extendsOneClassAndImplementsSeveralInterfaces.kt b/j2k/tests/testData/ast/class/extendsOneClassAndImplementsSeveralInterfaces.kt
index d253a077cee..ba4daad7631 100644
--- a/j2k/tests/testData/ast/class/extendsOneClassAndImplementsSeveralInterfaces.kt
+++ b/j2k/tests/testData/ast/class/extendsOneClassAndImplementsSeveralInterfaces.kt
@@ -1 +1 @@
-class A() : Base(), I0, I1, I2
\ No newline at end of file
+class A : Base(), I0, I1, I2
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/class/finalClass.kt b/j2k/tests/testData/ast/class/finalClass.kt
index 9eb0d07da4b..f7e70c7b871 100644
--- a/j2k/tests/testData/ast/class/finalClass.kt
+++ b/j2k/tests/testData/ast/class/finalClass.kt
@@ -1 +1 @@
-class Test()
\ No newline at end of file
+class Test
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/class/genericClass.kt b/j2k/tests/testData/ast/class/genericClass.kt
index eb27b9ce86e..c09b8199b10 100644
--- a/j2k/tests/testData/ast/class/genericClass.kt
+++ b/j2k/tests/testData/ast/class/genericClass.kt
@@ -1 +1 @@
-class Entry<K, V>()
\ No newline at end of file
+class Entry<K, V>
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/class/innerClassInInterface.kt b/j2k/tests/testData/ast/class/innerClassInInterface.kt
index bf27807d862..115ec0dca8f 100644
--- a/j2k/tests/testData/ast/class/innerClassInInterface.kt
+++ b/j2k/tests/testData/ast/class/innerClassInInterface.kt
@@ -1,3 +1,3 @@
 trait A {
-    public class B()
+    public class B
 }
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/class/innerEmptyClass.kt b/j2k/tests/testData/ast/class/innerEmptyClass.kt
index b87118b1c28..d4fad9808f7 100644
--- a/j2k/tests/testData/ast/class/innerEmptyClass.kt
+++ b/j2k/tests/testData/ast/class/innerEmptyClass.kt
@@ -1,3 +1,3 @@
-class A() {
-    inner class B()
+class A {
+    inner class B
 }
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/class/innerEnum.kt b/j2k/tests/testData/ast/class/innerEnum.kt
index 98202a1484b..96c0c373d58 100644
--- a/j2k/tests/testData/ast/class/innerEnum.kt
+++ b/j2k/tests/testData/ast/class/innerEnum.kt
@@ -1,4 +1,4 @@
-class A() {
+class A {
     enum class E {
         A
         B
diff --git a/j2k/tests/testData/ast/class/innerInterface.kt b/j2k/tests/testData/ast/class/innerInterface.kt
index 344a7196097..1cd343ca1d0 100644
--- a/j2k/tests/testData/ast/class/innerInterface.kt
+++ b/j2k/tests/testData/ast/class/innerInterface.kt
@@ -1,3 +1,3 @@
-class A() {
+class A {
     trait I
 }
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/class/innerStaticClass.kt b/j2k/tests/testData/ast/class/innerStaticClass.kt
index 86108fe20b2..4355eab3bcb 100644
--- a/j2k/tests/testData/ast/class/innerStaticClass.kt
+++ b/j2k/tests/testData/ast/class/innerStaticClass.kt
@@ -1,3 +1,3 @@
-class S() {
-    class Inner()
+class S {
+    class Inner
 }
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/class/internalClass.kt b/j2k/tests/testData/ast/class/internalClass.kt
index 9eb0d07da4b..f7e70c7b871 100644
--- a/j2k/tests/testData/ast/class/internalClass.kt
+++ b/j2k/tests/testData/ast/class/internalClass.kt
@@ -1 +1 @@
-class Test()
\ No newline at end of file
+class Test
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/class/kt-639.kt b/j2k/tests/testData/ast/class/kt-639.kt
index b9d664921b9..5d2309c1685 100644
--- a/j2k/tests/testData/ast/class/kt-639.kt
+++ b/j2k/tests/testData/ast/class/kt-639.kt
@@ -15,7 +15,7 @@ class Test private() {
     }
 }
 
-class User() {
+class User {
     fun main() {
         val m = HashMap(1)
         val m2 = HashMap(10)
diff --git a/j2k/tests/testData/ast/class/oneStaticFieldOneNonStatic.kt b/j2k/tests/testData/ast/class/oneStaticFieldOneNonStatic.kt
index 118a135c79c..48e905da0a6 100644
--- a/j2k/tests/testData/ast/class/oneStaticFieldOneNonStatic.kt
+++ b/j2k/tests/testData/ast/class/oneStaticFieldOneNonStatic.kt
@@ -1,4 +1,4 @@
-class S() {
+class S {
     fun sB(): Boolean {
         return true
     }
diff --git a/j2k/tests/testData/ast/class/oneStaticMethod.kt b/j2k/tests/testData/ast/class/oneStaticMethod.kt
index afff20a288b..6040f94a592 100644
--- a/j2k/tests/testData/ast/class/oneStaticMethod.kt
+++ b/j2k/tests/testData/ast/class/oneStaticMethod.kt
@@ -1,4 +1,4 @@
-class S() {
+class S {
     class object {
         fun staticF(): Boolean {
             return true
diff --git a/j2k/tests/testData/ast/class/oneStaticMethodOneNonStatic.kt b/j2k/tests/testData/ast/class/oneStaticMethodOneNonStatic.kt
index 8106a282485..c5eafb62c59 100644
--- a/j2k/tests/testData/ast/class/oneStaticMethodOneNonStatic.kt
+++ b/j2k/tests/testData/ast/class/oneStaticMethodOneNonStatic.kt
@@ -1,4 +1,4 @@
-class S() {
+class S {
     fun sB(): Boolean {
         return true
     }
diff --git a/j2k/tests/testData/ast/class/pivateClass.kt b/j2k/tests/testData/ast/class/pivateClass.kt
index ed5c74e2ac8..7ca39b18c72 100644
--- a/j2k/tests/testData/ast/class/pivateClass.kt
+++ b/j2k/tests/testData/ast/class/pivateClass.kt
@@ -1 +1 @@
-private class Test()
\ No newline at end of file
+private class Test
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/class/privateInit.kt b/j2k/tests/testData/ast/class/privateInit.kt
index 519db1ffe95..1f2043f1c62 100644
--- a/j2k/tests/testData/ast/class/privateInit.kt
+++ b/j2k/tests/testData/ast/class/privateInit.kt
@@ -1,4 +1,4 @@
-public class MyClass() {
+public class MyClass {
     private fun init(arg1: Int, arg2: Int, arg3: Int) {
     }
 }
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/class/protectedClass.kt b/j2k/tests/testData/ast/class/protectedClass.kt
index fc6c1ec5ff3..0614c1e6ae5 100644
--- a/j2k/tests/testData/ast/class/protectedClass.kt
+++ b/j2k/tests/testData/ast/class/protectedClass.kt
@@ -1 +1 @@
-protected class Test()
\ No newline at end of file
+protected class Test
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/class/publicClass.kt b/j2k/tests/testData/ast/class/publicClass.kt
index 97dcb46fa1b..687781bece7 100644
--- a/j2k/tests/testData/ast/class/publicClass.kt
+++ b/j2k/tests/testData/ast/class/publicClass.kt
@@ -1 +1 @@
-public class Test()
\ No newline at end of file
+public class Test
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/class/simpleInheritance.kt b/j2k/tests/testData/ast/class/simpleInheritance.kt
index b22be127052..d1599597ecd 100644
--- a/j2k/tests/testData/ast/class/simpleInheritance.kt
+++ b/j2k/tests/testData/ast/class/simpleInheritance.kt
@@ -1 +1 @@
-class A() : Base()
\ No newline at end of file
+class A : Base()
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/class/twoStaticMethod.kt b/j2k/tests/testData/ast/class/twoStaticMethod.kt
index a9606a266fa..2c7ab1f8381 100644
--- a/j2k/tests/testData/ast/class/twoStaticMethod.kt
+++ b/j2k/tests/testData/ast/class/twoStaticMethod.kt
@@ -1,4 +1,4 @@
-class S() {
+class S {
     class object {
         fun sB(): Boolean {
             return true
diff --git a/j2k/tests/testData/ast/comments/comments.kt b/j2k/tests/testData/ast/comments/comments.kt
index 8fbef48f875..a8be2acf5c1 100644
--- a/j2k/tests/testData/ast/comments/comments.kt
+++ b/j2k/tests/testData/ast/comments/comments.kt
@@ -8,7 +8,7 @@ import java.util.ArrayList
 // we need ArrayList
 
 // let's declare a class:
-class A /* just a sample name*/() : Runnable /* let's implement Runnable */ {
+class A /* just a sample name*/ : Runnable /* let's implement Runnable */ {
     fun foo/* again a sample name */(p: Int /* parameter p */, c: Char /* parameter c */) {
         // let's print something:
         System.out.println("1") // print 1
diff --git a/j2k/tests/testData/ast/comments/comments2.kt b/j2k/tests/testData/ast/comments/comments2.kt
index 0760fa55820..8ea0d2c3381 100644
--- a/j2k/tests/testData/ast/comments/comments2.kt
+++ b/j2k/tests/testData/ast/comments/comments2.kt
@@ -1,6 +1,6 @@
 package foo
 
-class A() {
+class A {
     fun /* nothing to return */ foo(/* no parameters at all */) {
         // let declare a variable
         // with 2 comments before
diff --git a/j2k/tests/testData/ast/comments/fieldWithEndOfLineComment.kt b/j2k/tests/testData/ast/comments/fieldWithEndOfLineComment.kt
index 4390146f416..6bd72ab934a 100644
--- a/j2k/tests/testData/ast/comments/fieldWithEndOfLineComment.kt
+++ b/j2k/tests/testData/ast/comments/fieldWithEndOfLineComment.kt
@@ -1,3 +1,3 @@
-class A() {
+class A {
     private val isOpen = true // ideally should be atomic boolean
 }
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/constructors/allCallsPrimary.kt b/j2k/tests/testData/ast/constructors/allCallsPrimary.kt
index df84622b5c6..f60af54d579 100644
--- a/j2k/tests/testData/ast/constructors/allCallsPrimary.kt
+++ b/j2k/tests/testData/ast/constructors/allCallsPrimary.kt
@@ -13,7 +13,7 @@ class C(arg1: Int, arg2: Int, arg3: Int) {
     }
 }
 
-public class User() {
+public class User {
     class object {
         public fun main() {
             val c1 = C(100, 100, 100)
diff --git a/j2k/tests/testData/ast/constructors/allCallsPrimary2.kt b/j2k/tests/testData/ast/constructors/allCallsPrimary2.kt
index d52b169f49d..f0ee3e1a303 100644
--- a/j2k/tests/testData/ast/constructors/allCallsPrimary2.kt
+++ b/j2k/tests/testData/ast/constructors/allCallsPrimary2.kt
@@ -25,7 +25,7 @@ class C(val myArg1: Int) {
     }
 }
 
-public class User() {
+public class User {
     class object {
         public fun main() {
             val c1 = C.create(100, 100, 100)
diff --git a/j2k/tests/testData/ast/constructors/customerBuilder.kt b/j2k/tests/testData/ast/constructors/customerBuilder.kt
index 393e7e8bb07..488a640616b 100644
--- a/j2k/tests/testData/ast/constructors/customerBuilder.kt
+++ b/j2k/tests/testData/ast/constructors/customerBuilder.kt
@@ -21,7 +21,7 @@ class Customer(public val _firstName: String, public val _lastName: String) {
     }
 }
 
-class CustomerBuilder() {
+class CustomerBuilder {
     public var _firstName: String = "Homer"
     public var _lastName: String = "Simpson"
 
@@ -40,7 +40,7 @@ class CustomerBuilder() {
     }
 }
 
-public class User() {
+public class User {
     class object {
         public fun main() {
             val customer = CustomerBuilder().WithFirstName("Homer").WithLastName("Simpson").Build()
diff --git a/j2k/tests/testData/ast/constructors/genericIdentifier.kt b/j2k/tests/testData/ast/constructors/genericIdentifier.kt
index e569d2ca8b5..7566ae2abc2 100644
--- a/j2k/tests/testData/ast/constructors/genericIdentifier.kt
+++ b/j2k/tests/testData/ast/constructors/genericIdentifier.kt
@@ -26,7 +26,7 @@ public class Identifier<T> private(private val myName: T, private val myHasDolla
     }
 }
 
-public class User() {
+public class User {
     class object {
         public fun main() {
             val i1 = Identifier.create<String>("name", false, true)
diff --git a/j2k/tests/testData/ast/constructors/identifier.kt b/j2k/tests/testData/ast/constructors/identifier.kt
index 3a3e6e9be5f..8f624da0568 100644
--- a/j2k/tests/testData/ast/constructors/identifier.kt
+++ b/j2k/tests/testData/ast/constructors/identifier.kt
@@ -26,7 +26,7 @@ public class Identifier private(private val myName: String, private val myHasDol
     }
 }
 
-public class User() {
+public class User {
     class object {
         public fun main() {
             val i1 = Identifier.create("name", false, true)
diff --git a/j2k/tests/testData/ast/constructors/parameterModification.kt b/j2k/tests/testData/ast/constructors/parameterModification.kt
index fc3f14faae3..de7024b5f62 100644
--- a/j2k/tests/testData/ast/constructors/parameterModification.kt
+++ b/j2k/tests/testData/ast/constructors/parameterModification.kt
@@ -26,7 +26,7 @@ class C(arg1: Int, arg2: Int, arg3: Int) {
     }
 }
 
-public class User() {
+public class User {
     class object {
         public fun main() {
             val c1 = C(100, 100, 100)
diff --git a/j2k/tests/testData/ast/constructors/withManyDefaultParams.kt b/j2k/tests/testData/ast/constructors/withManyDefaultParams.kt
index 5afaeb3f3d6..3569aea6b12 100644
--- a/j2k/tests/testData/ast/constructors/withManyDefaultParams.kt
+++ b/j2k/tests/testData/ast/constructors/withManyDefaultParams.kt
@@ -17,7 +17,7 @@ public class Test private(private val myName: String, var a: Boolean, var b: Dou
     }
 }
 
-public class User() {
+public class User {
     class object {
         public fun main() {
             val t = Test.create("name")
diff --git a/j2k/tests/testData/ast/equals/Equals1.kt b/j2k/tests/testData/ast/equals/Equals1.kt
index 7c36751115c..9edae84960c 100644
--- a/j2k/tests/testData/ast/equals/Equals1.kt
+++ b/j2k/tests/testData/ast/equals/Equals1.kt
@@ -1,6 +1,6 @@
 trait I
 
-class C() {
+class C {
     fun foo1(i1: I, i2: I): Boolean {
         return i1 == i2
     }
diff --git a/j2k/tests/testData/ast/equals/Equals2.kt b/j2k/tests/testData/ast/equals/Equals2.kt
index fa0e3f6c397..c1fac3a125d 100644
--- a/j2k/tests/testData/ast/equals/Equals2.kt
+++ b/j2k/tests/testData/ast/equals/Equals2.kt
@@ -1,4 +1,4 @@
-class C() {
+class C {
     fun foo1(s1: String, s2: String): Boolean {
         return s1 == s2
     }
diff --git a/j2k/tests/testData/ast/equals/Equals3.kt b/j2k/tests/testData/ast/equals/Equals3.kt
index 024ffe96951..37de7d423e5 100644
--- a/j2k/tests/testData/ast/equals/Equals3.kt
+++ b/j2k/tests/testData/ast/equals/Equals3.kt
@@ -1,4 +1,4 @@
-class C() {
+class C {
     public fun equals(c: C): Boolean {
         return false
     }
diff --git a/j2k/tests/testData/ast/equals/Equals4.kt b/j2k/tests/testData/ast/equals/Equals4.kt
index 4e19d21b66c..991b9cbc217 100644
--- a/j2k/tests/testData/ast/equals/Equals4.kt
+++ b/j2k/tests/testData/ast/equals/Equals4.kt
@@ -1,4 +1,4 @@
-class C() {
+class C {
     fun foo(s1: String, s2: String, s3: String, s4: String): Boolean {
         return s1 == s2 == (s3 != s4)
     }
diff --git a/j2k/tests/testData/ast/field/classChildExtendsBase.kt b/j2k/tests/testData/ast/field/classChildExtendsBase.kt
index c3cc9fc054a..ffd36b6e8ce 100644
--- a/j2k/tests/testData/ast/field/classChildExtendsBase.kt
+++ b/j2k/tests/testData/ast/field/classChildExtendsBase.kt
@@ -1,7 +1,7 @@
-class Base() {
+class Base {
     private val myFirst: String = 0
 }
 
-class Child() : Base() {
+class Child : Base() {
     private val mySecond: String = 0
 }
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/field/conversion.kt b/j2k/tests/testData/ast/field/conversion.kt
index a765f8b62f1..b4bfb15f5d6 100644
--- a/j2k/tests/testData/ast/field/conversion.kt
+++ b/j2k/tests/testData/ast/field/conversion.kt
@@ -1,4 +1,4 @@
-class A() {
+class A {
     private var i: Int? = getByte().toInt()
 
     fun foo() {
diff --git a/j2k/tests/testData/ast/field/internalField.kt b/j2k/tests/testData/ast/field/internalField.kt
index 8d789ab1717..c709cdfe4fa 100644
--- a/j2k/tests/testData/ast/field/internalField.kt
+++ b/j2k/tests/testData/ast/field/internalField.kt
@@ -1,3 +1,3 @@
-class C() {
+class C {
     var f: Foo = 0
 }
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/field/privateField.kt b/j2k/tests/testData/ast/field/privateField.kt
index f3e87b44ca0..1aa80e98ddb 100644
--- a/j2k/tests/testData/ast/field/privateField.kt
+++ b/j2k/tests/testData/ast/field/privateField.kt
@@ -1,3 +1,3 @@
-class C() {
+class C {
     private val f: Foo = 0
 }
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/field/protectedField.kt b/j2k/tests/testData/ast/field/protectedField.kt
index 91f3813466c..be7b40f6d0d 100644
--- a/j2k/tests/testData/ast/field/protectedField.kt
+++ b/j2k/tests/testData/ast/field/protectedField.kt
@@ -1,3 +1,3 @@
-class C() {
+class C {
     protected var f: Foo = 0
 }
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/field/publicField.kt b/j2k/tests/testData/ast/field/publicField.kt
index 2952347719f..31f46499ee0 100644
--- a/j2k/tests/testData/ast/field/publicField.kt
+++ b/j2k/tests/testData/ast/field/publicField.kt
@@ -1,3 +1,3 @@
-class C() {
+class C {
     public var f: Foo = 0
 }
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/field/specifyType.kt b/j2k/tests/testData/ast/field/specifyType.kt
index 57d4029693f..d9610a1301b 100644
--- a/j2k/tests/testData/ast/field/specifyType.kt
+++ b/j2k/tests/testData/ast/field/specifyType.kt
@@ -1,7 +1,7 @@
 import java.util.*
 import kotlin.List
 
-class A() {
+class A {
     private val field1 = ArrayList<String>()
     val field2: List<String> = ArrayList<String>()
     public val field3: Int = 0
diff --git a/j2k/tests/testData/ast/field/valWithInit.kt b/j2k/tests/testData/ast/field/valWithInit.kt
index beb1395d375..2953ed47eba 100644
--- a/j2k/tests/testData/ast/field/valWithInit.kt
+++ b/j2k/tests/testData/ast/field/valWithInit.kt
@@ -1,3 +1,3 @@
-class C() {
+class C {
     val f = Foo(1, 2)
 }
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/field/varWithInit.kt b/j2k/tests/testData/ast/field/varWithInit.kt
index ffed0dcc3a5..04bad754532 100644
--- a/j2k/tests/testData/ast/field/varWithInit.kt
+++ b/j2k/tests/testData/ast/field/varWithInit.kt
@@ -1,3 +1,3 @@
-class C() {
+class C {
     var f = Foo(1, 2)
 }
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/field/varWithoutInit.kt b/j2k/tests/testData/ast/field/varWithoutInit.kt
index 8d789ab1717..c709cdfe4fa 100644
--- a/j2k/tests/testData/ast/field/varWithoutInit.kt
+++ b/j2k/tests/testData/ast/field/varWithoutInit.kt
@@ -1,3 +1,3 @@
-class C() {
+class C {
     var f: Foo = 0
 }
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/formatting/nonStaticMembers.kt b/j2k/tests/testData/ast/formatting/nonStaticMembers.kt
index ff73612e96b..280db7370fe 100644
--- a/j2k/tests/testData/ast/formatting/nonStaticMembers.kt
+++ b/j2k/tests/testData/ast/formatting/nonStaticMembers.kt
@@ -1,4 +1,4 @@
-class F() {
+class F {
 
     fun f1() {
     }
diff --git a/j2k/tests/testData/ast/formatting/nonStaticMembersWithComments.kt b/j2k/tests/testData/ast/formatting/nonStaticMembersWithComments.kt
index 6a19db6efe0..9e1ffe809ea 100644
--- a/j2k/tests/testData/ast/formatting/nonStaticMembersWithComments.kt
+++ b/j2k/tests/testData/ast/formatting/nonStaticMembersWithComments.kt
@@ -1,4 +1,4 @@
-class F() {
+class F {
 
     //c1
 
diff --git a/j2k/tests/testData/ast/formatting/staticAndNonStaticMembersWithComments.kt b/j2k/tests/testData/ast/formatting/staticAndNonStaticMembersWithComments.kt
index 2d1d3b24f86..c8a3626dc21 100644
--- a/j2k/tests/testData/ast/formatting/staticAndNonStaticMembersWithComments.kt
+++ b/j2k/tests/testData/ast/formatting/staticAndNonStaticMembersWithComments.kt
@@ -1,4 +1,4 @@
-class F() {
+class F {
 
     //c3
 
diff --git a/j2k/tests/testData/ast/formatting/staticMembersWithComments.kt b/j2k/tests/testData/ast/formatting/staticMembersWithComments.kt
index 5613de90b2f..da8ddcde186 100644
--- a/j2k/tests/testData/ast/formatting/staticMembersWithComments.kt
+++ b/j2k/tests/testData/ast/formatting/staticMembersWithComments.kt
@@ -1,4 +1,4 @@
-class F() {
+class F {
     class object {
 
         //c1
diff --git a/j2k/tests/testData/ast/function/extendsBaseWhichExtendsObject.kt b/j2k/tests/testData/ast/function/extendsBaseWhichExtendsObject.kt
index 57d95afb66e..5eb618c2c0b 100644
--- a/j2k/tests/testData/ast/function/extendsBaseWhichExtendsObject.kt
+++ b/j2k/tests/testData/ast/function/extendsBaseWhichExtendsObject.kt
@@ -1,6 +1,6 @@
 package test
 
-class Test() : Base() {
+class Test : Base() {
     override fun hashCode(): Int {
         return super.hashCode()
     }
@@ -24,7 +24,7 @@ class Test() : Base() {
     }
 }
 
-class Base() {
+class Base {
     override fun hashCode(): Int {
         return super.hashCode()
     }
diff --git a/j2k/tests/testData/ast/function/functionInFinalClass.kt b/j2k/tests/testData/ast/function/functionInFinalClass.kt
index a6f400168ce..7653fdd6b8a 100644
--- a/j2k/tests/testData/ast/function/functionInFinalClass.kt
+++ b/j2k/tests/testData/ast/function/functionInFinalClass.kt
@@ -1,6 +1,6 @@
 package demo
 
-class Final() {
+class Final {
     fun test() {
     }
 }
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/function/override.kt b/j2k/tests/testData/ast/function/override.kt
index cf7ed6fcaa3..bcf037a296d 100644
--- a/j2k/tests/testData/ast/function/override.kt
+++ b/j2k/tests/testData/ast/function/override.kt
@@ -1,8 +1,8 @@
-class A() {
+class A {
     fun a() {
     }
 }
-class B() : A() {
+class B : A() {
     override fun a() {
     }
 }
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/function/overrideAndOpen.kt b/j2k/tests/testData/ast/function/overrideAndOpen.kt
index 6827fe9f063..23650098fcc 100644
--- a/j2k/tests/testData/ast/function/overrideAndOpen.kt
+++ b/j2k/tests/testData/ast/function/overrideAndOpen.kt
@@ -1,14 +1,14 @@
-class A() {
+class A {
     fun foo() {
     }
 }
 
-class B() : A() {
+class B : A() {
     override fun foo() {
     }
 }
 
-class C() : B() {
+class C : B() {
     override fun foo() {
     }
 }
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/function/overrideObject.kt b/j2k/tests/testData/ast/function/overrideObject.kt
index fe55ec8bf2c..445eb5d5c48 100644
--- a/j2k/tests/testData/ast/function/overrideObject.kt
+++ b/j2k/tests/testData/ast/function/overrideObject.kt
@@ -1,4 +1,4 @@
-class X() {
+class X {
     override fun hashCode(): Int {
         return super.hashCode()
     }
@@ -17,7 +17,7 @@ class X() {
     }
 }
 
-class Y() : Thread() {
+class Y : Thread() {
     throws(javaClass<CloneNotSupportedException>())
     override fun clone(): Any {
         return super.clone()
diff --git a/j2k/tests/testData/ast/function/overrideObject2.kt b/j2k/tests/testData/ast/function/overrideObject2.kt
index 9646e9e2740..03149780e06 100644
--- a/j2k/tests/testData/ast/function/overrideObject2.kt
+++ b/j2k/tests/testData/ast/function/overrideObject2.kt
@@ -1,6 +1,6 @@
-class Base()
+class Base
 
-class X() : Base() {
+class X : Base() {
     override fun hashCode(): Int {
         return super.hashCode()
     }
diff --git a/j2k/tests/testData/ast/function/overrideObject3.kt b/j2k/tests/testData/ast/function/overrideObject3.kt
index de83777788d..dc6e3221d44 100644
--- a/j2k/tests/testData/ast/function/overrideObject3.kt
+++ b/j2k/tests/testData/ast/function/overrideObject3.kt
@@ -1,10 +1,10 @@
-class Base() {
+class Base {
     override fun equals(o: Any?): Boolean {
         return super.equals(o)
     }
 }
 
-class X() : Base() {
+class X : Base() {
     override fun equals(o: Any?): Boolean {
         return super.equals(o)
     }
diff --git a/j2k/tests/testData/ast/function/varVararg.kt b/j2k/tests/testData/ast/function/varVararg.kt
index ba285989ec9..59f72dae8e9 100644
--- a/j2k/tests/testData/ast/function/varVararg.kt
+++ b/j2k/tests/testData/ast/function/varVararg.kt
@@ -1,6 +1,6 @@
 package demo
 
-class Test() {
+class Test {
     fun test(vararg args: Any) {
         var args = args
         args = array<Int>(1, 2, 3)
diff --git a/j2k/tests/testData/ast/identifier/finalFieldReference.kt b/j2k/tests/testData/ast/identifier/finalFieldReference.kt
index 678e5b332e2..15ed987d38a 100644
--- a/j2k/tests/testData/ast/identifier/finalFieldReference.kt
+++ b/j2k/tests/testData/ast/identifier/finalFieldReference.kt
@@ -1,6 +1,6 @@
-class `$$$$$`()
+class `$$$$$`
 
-class `$`()
+class `$`
 
 class `$$`(val `$$$`: `$$$$$`) : `$`() {
 
diff --git a/j2k/tests/testData/ast/importStatement/importWithKeywords.kt b/j2k/tests/testData/ast/importStatement/importWithKeywords.kt
index c9959e925fd..b3570ddf0be 100644
--- a/j2k/tests/testData/ast/importStatement/importWithKeywords.kt
+++ b/j2k/tests/testData/ast/importStatement/importWithKeywords.kt
@@ -2,4 +2,4 @@ package test
 
 import `as`.`type`.`val`.`var`.`fun`.`is`.`in`.`object`.`when`.`trait`.`This`
 
-class Test()
\ No newline at end of file
+class Test
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/importStatement/importWithStar.kt b/j2k/tests/testData/ast/importStatement/importWithStar.kt
index 21965cae265..86ac68c0e36 100644
--- a/j2k/tests/testData/ast/importStatement/importWithStar.kt
+++ b/j2k/tests/testData/ast/importStatement/importWithStar.kt
@@ -2,4 +2,4 @@ package org.jetbrains.jet.j2k
 
 import org.jetbrains.annotations.*
 
-public class Converter()
\ No newline at end of file
+public class Converter
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/importStatement/simpleImport.kt b/j2k/tests/testData/ast/importStatement/simpleImport.kt
index 884fd619677..31d5b6d7e72 100644
--- a/j2k/tests/testData/ast/importStatement/simpleImport.kt
+++ b/j2k/tests/testData/ast/importStatement/simpleImport.kt
@@ -1,3 +1,3 @@
 package org.jetbrains.jet.j2k
 
-public class Converter()
\ No newline at end of file
+public class Converter
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParams.kt b/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParams.kt
index b0bed1c0f9f..2ff732d27f9 100644
--- a/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParams.kt
+++ b/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParams.kt
@@ -1,3 +1,3 @@
-class Base()
+class Base
 
-class One() : Base()
\ No newline at end of file
+class One : Base()
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/issues/arrayLength.kt b/j2k/tests/testData/ast/issues/arrayLength.kt
index a68f7e6e4db..5901396f600 100644
--- a/j2k/tests/testData/ast/issues/arrayLength.kt
+++ b/j2k/tests/testData/ast/issues/arrayLength.kt
@@ -1,4 +1,4 @@
-class Test() {
+class Test {
     class object {
         public fun foo(args: Array<String>): Int {
             return args.size
diff --git a/j2k/tests/testData/ast/issues/comments.kt b/j2k/tests/testData/ast/issues/comments.kt
index 9ccc6394f66..2b37baa03af 100644
--- a/j2k/tests/testData/ast/issues/comments.kt
+++ b/j2k/tests/testData/ast/issues/comments.kt
@@ -9,7 +9,7 @@ This is a block comment
 //one line comment of class
 //another one
 /*another doc*/
-class C() {
+class C {
     // This is a class comment
 
     /**
diff --git a/j2k/tests/testData/ast/issues/doNotQualifyStatic.kt b/j2k/tests/testData/ast/issues/doNotQualifyStatic.kt
index d9e1d59ea45..d946dd5a3f3 100644
--- a/j2k/tests/testData/ast/issues/doNotQualifyStatic.kt
+++ b/j2k/tests/testData/ast/issues/doNotQualifyStatic.kt
@@ -1,6 +1,6 @@
-class Outer() {
+class Outer {
 
-    public class Nested() {
+    public class Nested {
         public fun foo() {
             o = null
         }
diff --git a/j2k/tests/testData/ast/issues/kt-1048.kt b/j2k/tests/testData/ast/issues/kt-1048.kt
index 27bd795083c..64ddaf7071d 100644
--- a/j2k/tests/testData/ast/issues/kt-1048.kt
+++ b/j2k/tests/testData/ast/issues/kt-1048.kt
@@ -2,7 +2,7 @@ import java.util.HashMap
 
 class G<T : String>(t: T)
 
-public class Java() {
+public class Java {
     fun test() {
         val m = HashMap()
         m.put(1, 1)
diff --git a/j2k/tests/testData/ast/issues/kt-1074.kt b/j2k/tests/testData/ast/issues/kt-1074.kt
index 56321222166..a4aba42d72a 100644
--- a/j2k/tests/testData/ast/issues/kt-1074.kt
+++ b/j2k/tests/testData/ast/issues/kt-1074.kt
@@ -1,6 +1,6 @@
 package demo
 
-class Test() {
+class Test {
     class object {
         fun subListRangeCheck(fromIndex: Int, toIndex: Int, size: Int) {
             if (fromIndex < 0)
diff --git a/j2k/tests/testData/ast/issues/kt-543-boxed.kt b/j2k/tests/testData/ast/issues/kt-543-boxed.kt
index 422897d015b..71580b0d3dd 100644
--- a/j2k/tests/testData/ast/issues/kt-543-boxed.kt
+++ b/j2k/tests/testData/ast/issues/kt-543-boxed.kt
@@ -1,6 +1,6 @@
 package demo
 
-class Test() {
+class Test {
     fun putInt(i: Int?) {
     }
 
diff --git a/j2k/tests/testData/ast/issues/kt-543-mixed.kt b/j2k/tests/testData/ast/issues/kt-543-mixed.kt
index 51c5780d3d0..7d4aa3b0b1a 100644
--- a/j2k/tests/testData/ast/issues/kt-543-mixed.kt
+++ b/j2k/tests/testData/ast/issues/kt-543-mixed.kt
@@ -1,6 +1,6 @@
 package demo
 
-class Test() {
+class Test {
     fun putInt(i: Int?) {
     }
 
diff --git a/j2k/tests/testData/ast/issues/kt-543.kt b/j2k/tests/testData/ast/issues/kt-543.kt
index 804c0e4e7ec..b8d25d24a58 100644
--- a/j2k/tests/testData/ast/issues/kt-543.kt
+++ b/j2k/tests/testData/ast/issues/kt-543.kt
@@ -1,6 +1,6 @@
 package demo
 
-class Test() {
+class Test {
     fun putInt(i: Int) {
     }
 
diff --git a/j2k/tests/testData/ast/issues/kt-638.kt b/j2k/tests/testData/ast/issues/kt-638.kt
index 6e7be82d223..5401cdb5559 100644
--- a/j2k/tests/testData/ast/issues/kt-638.kt
+++ b/j2k/tests/testData/ast/issues/kt-638.kt
@@ -26,7 +26,7 @@ public class Identifier<T> private(private val myName: T, private val myHasDolla
     }
 }
 
-public class User() {
+public class User {
     class object {
         public fun main(args: Array<String>) {
             val i1 = Identifier.create<String>("name", false, true)
diff --git a/j2k/tests/testData/ast/issues/kt-696.kt b/j2k/tests/testData/ast/issues/kt-696.kt
index d9aefd9c3ac..e508906ec72 100644
--- a/j2k/tests/testData/ast/issues/kt-696.kt
+++ b/j2k/tests/testData/ast/issues/kt-696.kt
@@ -1,6 +1,6 @@
 package test
 
-class Base() {
+class Base {
     override fun hashCode(): Int {
         return super.hashCode()
     }
@@ -14,7 +14,7 @@ class Base() {
     }
 }
 
-class Child() : Base() {
+class Child : Base() {
     override fun hashCode(): Int {
         return super.hashCode()
     }
diff --git a/j2k/tests/testData/ast/issues/kt-794-mixed.kt b/j2k/tests/testData/ast/issues/kt-794-mixed.kt
index f69a5e05698..ce9bc1da7b9 100644
--- a/j2k/tests/testData/ast/issues/kt-794-mixed.kt
+++ b/j2k/tests/testData/ast/issues/kt-794-mixed.kt
@@ -1,6 +1,6 @@
 package demo
 
-class Test() {
+class Test {
     fun getInteger(i: Int?): Int? {
         return i
     }
diff --git a/j2k/tests/testData/ast/issues/kt-794.kt b/j2k/tests/testData/ast/issues/kt-794.kt
index fc8a0f8fb4e..488c491a365 100644
--- a/j2k/tests/testData/ast/issues/kt-794.kt
+++ b/j2k/tests/testData/ast/issues/kt-794.kt
@@ -1,4 +1,4 @@
-class Test() {
+class Test {
     fun getInt(): Int {
         val b = 10
         return b.toInt()
diff --git a/j2k/tests/testData/ast/issues/kt-809-string.kt b/j2k/tests/testData/ast/issues/kt-809-string.kt
index b6e142a9f62..ef31265be54 100644
--- a/j2k/tests/testData/ast/issues/kt-809-string.kt
+++ b/j2k/tests/testData/ast/issues/kt-809-string.kt
@@ -1,10 +1,10 @@
 package demo
 
-class Container() {
+class Container {
     var myString = "1"
 }
 
-class One() {
+class One {
     class object {
         var myContainer = Container()
     }
@@ -12,7 +12,7 @@ class One() {
 
 class StringContainer(s: String)
 
-class Test() {
+class Test {
     fun putString(s: String) {
     }
     fun test() {
diff --git a/j2k/tests/testData/ast/issues/kt-809.kt b/j2k/tests/testData/ast/issues/kt-809.kt
index c5f8865c31c..726a97aa2e3 100644
--- a/j2k/tests/testData/ast/issues/kt-809.kt
+++ b/j2k/tests/testData/ast/issues/kt-809.kt
@@ -1,10 +1,10 @@
 package demo
 
-class Container() {
+class Container {
     var myInt = 1
 }
 
-class One() {
+class One {
     class object {
         var myContainer = Container()
     }
@@ -12,7 +12,7 @@ class One() {
 
 class IntContainer(i: Int)
 
-class Test() {
+class Test {
     fun putInt(i: Int) {
     }
     fun test() {
diff --git a/j2k/tests/testData/ast/issues/kt-820-field.kt b/j2k/tests/testData/ast/issues/kt-820-field.kt
index b02d789a401..eafb079518a 100644
--- a/j2k/tests/testData/ast/issues/kt-820-field.kt
+++ b/j2k/tests/testData/ast/issues/kt-820-field.kt
@@ -1,15 +1,15 @@
 package demo
 
-class Container() {
+class Container {
     var myInt = 1
 }
 
-class One() {
+class One {
     class object {
         var myContainer = Container()
     }
 }
 
-class Test() {
+class Test {
     var b = One.myContainer.myInt.toByte()
 }
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/issues/kt-820-string.kt b/j2k/tests/testData/ast/issues/kt-820-string.kt
index f9ab23ad088..814e8e24768 100644
--- a/j2k/tests/testData/ast/issues/kt-820-string.kt
+++ b/j2k/tests/testData/ast/issues/kt-820-string.kt
@@ -1,4 +1,4 @@
-class Test() {
+class Test {
     class object {
         public fun toFileSystemSafeName(name: String): String {
             val size = name.length()
diff --git a/j2k/tests/testData/ast/issues/kt-820.kt b/j2k/tests/testData/ast/issues/kt-820.kt
index fc630979d15..db8bb5bbde6 100644
--- a/j2k/tests/testData/ast/issues/kt-820.kt
+++ b/j2k/tests/testData/ast/issues/kt-820.kt
@@ -1,16 +1,16 @@
 package demo
 
-class Container() {
+class Container {
     var myInt = 1
 }
 
-class One() {
+class One {
     class object {
         var myContainer = Container()
     }
 }
 
-class Test() {
+class Test {
     fun test() {
         val b = One.myContainer.myInt.toByte()
     }
diff --git a/j2k/tests/testData/ast/issues/kt-824-isDir.kt b/j2k/tests/testData/ast/issues/kt-824-isDir.kt
index a02066bb927..d7dfee5cea5 100644
--- a/j2k/tests/testData/ast/issues/kt-824-isDir.kt
+++ b/j2k/tests/testData/ast/issues/kt-824-isDir.kt
@@ -5,7 +5,7 @@ import java.io.File
 /**
  * User: ignatov
  */
-public class Test() {
+public class Test {
     class object {
         public fun isDir(parent: File?): Boolean {
             if (parent == null || !parent!!.exists()) {
diff --git a/j2k/tests/testData/ast/issues/kt-824.kt b/j2k/tests/testData/ast/issues/kt-824.kt
index d7d016b07b8..83972e65098 100644
--- a/j2k/tests/testData/ast/issues/kt-824.kt
+++ b/j2k/tests/testData/ast/issues/kt-824.kt
@@ -1,16 +1,16 @@
 package demo
 
-class Container() {
+class Container {
     var myBoolean = true
 }
 
-class One() {
+class One {
     class object {
         var myContainer = Container()
     }
 }
 
-class Test() {
+class Test {
     fun test() {
         if (One.myContainer.myBoolean)
             System.out.println("Ok")
diff --git a/j2k/tests/testData/ast/issues/kt-828.kt b/j2k/tests/testData/ast/issues/kt-828.kt
index 03c91effa20..eca1c95ebf2 100644
--- a/j2k/tests/testData/ast/issues/kt-828.kt
+++ b/j2k/tests/testData/ast/issues/kt-828.kt
@@ -1,4 +1,4 @@
-class Test() {
+class Test {
     fun test() {
         var res = true
         res = res and false
diff --git a/j2k/tests/testData/ast/issues/kt-836.kt b/j2k/tests/testData/ast/issues/kt-836.kt
index 1737733743c..e1d2d948971 100644
--- a/j2k/tests/testData/ast/issues/kt-836.kt
+++ b/j2k/tests/testData/ast/issues/kt-836.kt
@@ -9,7 +9,7 @@ public class Language(protected var code: String) : Serializable {
     }
 }
 
-class Base() {
+class Base {
     fun test() {
     }
     override fun toString(): String {
@@ -17,7 +17,7 @@ class Base() {
     }
 }
 
-class Child() : Base() {
+class Child : Base() {
     override fun test() {
     }
     override fun toString(): String {
diff --git a/j2k/tests/testData/ast/issues/kt-851.kt b/j2k/tests/testData/ast/issues/kt-851.kt
index 200c33442d1..d4051b329fe 100644
--- a/j2k/tests/testData/ast/issues/kt-851.kt
+++ b/j2k/tests/testData/ast/issues/kt-851.kt
@@ -1,4 +1,4 @@
-class Test() {
+class Test {
     fun putInt(i: Int) {
     }
 
diff --git a/j2k/tests/testData/ast/issues/kt-852.kt b/j2k/tests/testData/ast/issues/kt-852.kt
index 70f0d4a9fc1..4f01eb44bb3 100644
--- a/j2k/tests/testData/ast/issues/kt-852.kt
+++ b/j2k/tests/testData/ast/issues/kt-852.kt
@@ -1,6 +1,6 @@
 package demo
 
-class Test() {
+class Test {
     fun test(): String {
         val s1 = ""
         val s2 = ""
diff --git a/j2k/tests/testData/ast/issues/kt-871.kt b/j2k/tests/testData/ast/issues/kt-871.kt
index 1f09d168f4b..d39c20b6e45 100644
--- a/j2k/tests/testData/ast/issues/kt-871.kt
+++ b/j2k/tests/testData/ast/issues/kt-871.kt
@@ -1,6 +1,6 @@
 package demo
 
-class Program() {
+class Program {
     class object {
         public fun main(args: Array<String>) {
             System.out.println("Halo!")
diff --git a/j2k/tests/testData/ast/issues/kt-879.kt b/j2k/tests/testData/ast/issues/kt-879.kt
index 1afd07def0b..1e1ff71b3ad 100644
--- a/j2k/tests/testData/ast/issues/kt-879.kt
+++ b/j2k/tests/testData/ast/issues/kt-879.kt
@@ -1,4 +1,4 @@
-class Test() {
+class Test {
     class object {
         public fun getInt(i: Int): Int {
             when (i) {
diff --git a/j2k/tests/testData/ast/issues/kt-893.kt b/j2k/tests/testData/ast/issues/kt-893.kt
index 17a4e93b8da..30d9bc0cac6 100644
--- a/j2k/tests/testData/ast/issues/kt-893.kt
+++ b/j2k/tests/testData/ast/issues/kt-893.kt
@@ -1,6 +1,6 @@
 package demo
 
-class Test() {
+class Test {
     fun test() {
         for (i in 0..10 - 1) {
             System.out.println(i)
diff --git a/j2k/tests/testData/ast/issues/qualifyStatic.kt b/j2k/tests/testData/ast/issues/qualifyStatic.kt
index 78187e0669e..065bb49ce5f 100644
--- a/j2k/tests/testData/ast/issues/qualifyStatic.kt
+++ b/j2k/tests/testData/ast/issues/qualifyStatic.kt
@@ -1,6 +1,6 @@
 import java.util.Calendar
 
-abstract class MyCalendar() : Calendar() {
+abstract class MyCalendar : Calendar() {
     public fun foo() {
         val i = Calendar.ALL_STYLES
     }
diff --git a/j2k/tests/testData/ast/issues/spaceBeforeAssignment.kt b/j2k/tests/testData/ast/issues/spaceBeforeAssignment.kt
index 7f360fb4f0d..292890fd19e 100644
--- a/j2k/tests/testData/ast/issues/spaceBeforeAssignment.kt
+++ b/j2k/tests/testData/ast/issues/spaceBeforeAssignment.kt
@@ -1,6 +1,6 @@
 import java.util.*
 import kotlin.List
 
-class A() {
+class A {
     var list: List<String> = ArrayList<String>()
 }
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/kotlinApiAccess/ClassObjectMembers.kt b/j2k/tests/testData/ast/kotlinApiAccess/ClassObjectMembers.kt
index ad07fbb0584..f9213e02d8b 100644
--- a/j2k/tests/testData/ast/kotlinApiAccess/ClassObjectMembers.kt
+++ b/j2k/tests/testData/ast/kotlinApiAccess/ClassObjectMembers.kt
@@ -1,6 +1,6 @@
 import kotlinApi.KotlinClass
 
-class C() {
+class C {
     fun foo(): Int {
         KotlinClass.staticVar = KotlinClass.staticVar * 2
         KotlinClass.staticProperty = KotlinClass.staticVar + KotlinClass.staticProperty
diff --git a/j2k/tests/testData/ast/kotlinApiAccess/CorrectFunNullabilityDetected.kt b/j2k/tests/testData/ast/kotlinApiAccess/CorrectFunNullabilityDetected.kt
index fc60f982b07..0062ee03271 100644
--- a/j2k/tests/testData/ast/kotlinApiAccess/CorrectFunNullabilityDetected.kt
+++ b/j2k/tests/testData/ast/kotlinApiAccess/CorrectFunNullabilityDetected.kt
@@ -1,6 +1,6 @@
 import kotlinApi.*
 
-class A() {
+class A {
     fun foo(t: KotlinTrait): Int {
         return t.nullableFun()!!.length() + t.notNullableFun().length()
     }
diff --git a/j2k/tests/testData/ast/kotlinApiAccess/CorrectNullabilityDetected.kt b/j2k/tests/testData/ast/kotlinApiAccess/CorrectNullabilityDetected.kt
index 5f0a497b350..d48213e8d99 100644
--- a/j2k/tests/testData/ast/kotlinApiAccess/CorrectNullabilityDetected.kt
+++ b/j2k/tests/testData/ast/kotlinApiAccess/CorrectNullabilityDetected.kt
@@ -1,6 +1,6 @@
 import kotlinApi.*
 
-class A() {
+class A {
     fun foo(c: KotlinClass): Int {
         return c.nullableProperty!!.length() + c.property.length() + KotlinClass.nullableStaticVar!! + KotlinClass.staticVar + KotlinClass.nullableStaticFun(1)!! + KotlinClass.staticFun(1) + nullableGlobalFunction("")!!.length() + globalFunction("").length()
     }
diff --git a/j2k/tests/testData/ast/kotlinApiAccess/ExtensionFunction.kt b/j2k/tests/testData/ast/kotlinApiAccess/ExtensionFunction.kt
index 058b88e1dd0..ddfed2e0823 100644
--- a/j2k/tests/testData/ast/kotlinApiAccess/ExtensionFunction.kt
+++ b/j2k/tests/testData/ast/kotlinApiAccess/ExtensionFunction.kt
@@ -1,6 +1,6 @@
 import kotlinApi.*
 
-class C() {
+class C {
     fun foo() {
         val s = 1.extensionFunction()
     }
diff --git a/j2k/tests/testData/ast/kotlinApiAccess/ExtensionProperty.kt b/j2k/tests/testData/ast/kotlinApiAccess/ExtensionProperty.kt
index c6a11c8bddb..c1bf65fe1b4 100644
--- a/j2k/tests/testData/ast/kotlinApiAccess/ExtensionProperty.kt
+++ b/j2k/tests/testData/ast/kotlinApiAccess/ExtensionProperty.kt
@@ -1,6 +1,6 @@
 import kotlinApi.*
 
-class C() {
+class C {
     fun foo(): Int {
         "a".extensionProperty = 1
         return "b".extensionProperty
diff --git a/j2k/tests/testData/ast/kotlinApiAccess/GlobalFunction.kt b/j2k/tests/testData/ast/kotlinApiAccess/GlobalFunction.kt
index dfd478dfe49..0083a05a497 100644
--- a/j2k/tests/testData/ast/kotlinApiAccess/GlobalFunction.kt
+++ b/j2k/tests/testData/ast/kotlinApiAccess/GlobalFunction.kt
@@ -1,6 +1,6 @@
 import kotlinApi.*
 
-class C() {
+class C {
     fun foo() {
         val s = globalFunction("x")
     }
diff --git a/j2k/tests/testData/ast/kotlinApiAccess/GlobalGenericFunction.kt b/j2k/tests/testData/ast/kotlinApiAccess/GlobalGenericFunction.kt
index da4f2b3f3dd..9830346c6e2 100644
--- a/j2k/tests/testData/ast/kotlinApiAccess/GlobalGenericFunction.kt
+++ b/j2k/tests/testData/ast/kotlinApiAccess/GlobalGenericFunction.kt
@@ -1,6 +1,6 @@
 import kotlinApi.*
 
-class C() {
+class C {
     fun foo() {
         val v = globalGenericFunction<Int>(1)
     }
diff --git a/j2k/tests/testData/ast/kotlinApiAccess/GlobalValue1.kt b/j2k/tests/testData/ast/kotlinApiAccess/GlobalValue1.kt
index aa88eef973f..ef04fb2d976 100644
--- a/j2k/tests/testData/ast/kotlinApiAccess/GlobalValue1.kt
+++ b/j2k/tests/testData/ast/kotlinApiAccess/GlobalValue1.kt
@@ -1,6 +1,6 @@
 import kotlinApi.*
 
-class C() {
+class C {
     fun foo(): Int {
         globalValue1 = 0
         return globalValue1
diff --git a/j2k/tests/testData/ast/kotlinApiAccess/GlobalValue2.kt b/j2k/tests/testData/ast/kotlinApiAccess/GlobalValue2.kt
index 84e96eceb3e..f9927da5b66 100644
--- a/j2k/tests/testData/ast/kotlinApiAccess/GlobalValue2.kt
+++ b/j2k/tests/testData/ast/kotlinApiAccess/GlobalValue2.kt
@@ -1,6 +1,6 @@
 import kotlinApi.*
 
-class C() {
+class C {
     fun foo(): Int {
         globalValue2 = 0
         return globalValue2
diff --git a/j2k/tests/testData/ast/kotlinApiAccess/InheritedProperty.kt b/j2k/tests/testData/ast/kotlinApiAccess/InheritedProperty.kt
index 4fe3001a917..05a35457e67 100644
--- a/j2k/tests/testData/ast/kotlinApiAccess/InheritedProperty.kt
+++ b/j2k/tests/testData/ast/kotlinApiAccess/InheritedProperty.kt
@@ -1,6 +1,6 @@
 import kotlinApi.*
 
-class C() : KotlinClass() {
+class C : KotlinClass() {
     fun foo() {
         System.out.println(property)
         property = "a"
diff --git a/j2k/tests/testData/ast/kotlinApiAccess/ObjectMembers.kt b/j2k/tests/testData/ast/kotlinApiAccess/ObjectMembers.kt
index afbd052a1e6..bbe2a37c094 100644
--- a/j2k/tests/testData/ast/kotlinApiAccess/ObjectMembers.kt
+++ b/j2k/tests/testData/ast/kotlinApiAccess/ObjectMembers.kt
@@ -1,6 +1,6 @@
 import kotlinApi.KotlinObject
 
-class C() {
+class C {
     fun foo(): Int {
         KotlinObject.property1 = 1
         KotlinObject.property2 = 2
diff --git a/j2k/tests/testData/ast/kotlinApiAccess/Property.kt b/j2k/tests/testData/ast/kotlinApiAccess/Property.kt
index c66d3484503..721368e2987 100644
--- a/j2k/tests/testData/ast/kotlinApiAccess/Property.kt
+++ b/j2k/tests/testData/ast/kotlinApiAccess/Property.kt
@@ -1,6 +1,6 @@
 import kotlinApi.*
 
-class C() {
+class C {
     fun foo(k: KotlinClass) {
         System.out.println(k.property)
         k.property = "a"
diff --git a/j2k/tests/testData/ast/kotlinApiAccess/Property2.kt b/j2k/tests/testData/ast/kotlinApiAccess/Property2.kt
index a324826d9e4..d65a44f56ba 100644
--- a/j2k/tests/testData/ast/kotlinApiAccess/Property2.kt
+++ b/j2k/tests/testData/ast/kotlinApiAccess/Property2.kt
@@ -1,6 +1,6 @@
 import kotlinApi.*
 
-class C() {
+class C {
     fun foo(k: KotlinClass) {
         System.out.println(k.field)
         k.field = 1
diff --git a/j2k/tests/testData/ast/list/ForEach.kt b/j2k/tests/testData/ast/list/ForEach.kt
index 514a4bedced..e71692caa8c 100644
--- a/j2k/tests/testData/ast/list/ForEach.kt
+++ b/j2k/tests/testData/ast/list/ForEach.kt
@@ -1,6 +1,6 @@
 import java.util.*
 
-public class ForEach() {
+public class ForEach {
     public fun test() {
         val xs = ArrayList<Any>()
         val ys = LinkedList<Any>()
diff --git a/j2k/tests/testData/ast/list/Lists.kt b/j2k/tests/testData/ast/list/Lists.kt
index fa18ac3de26..b1a8cf0e434 100644
--- a/j2k/tests/testData/ast/list/Lists.kt
+++ b/j2k/tests/testData/ast/list/Lists.kt
@@ -1,6 +1,6 @@
 import java.util.*
 
-public class Lists() {
+public class Lists {
     public fun test() {
         val xs = ArrayList<Any>()
         val ys = LinkedList<Any>()
diff --git a/j2k/tests/testData/ast/literalExpression/char.kt b/j2k/tests/testData/ast/literalExpression/char.kt
index fde7d4cd475..83a67bdb64e 100644
--- a/j2k/tests/testData/ast/literalExpression/char.kt
+++ b/j2k/tests/testData/ast/literalExpression/char.kt
@@ -1,4 +1,4 @@
-class Test() {
+class Test {
     fun test() {
         val c1 = 'c'
         val c2 = 'C'
diff --git a/j2k/tests/testData/ast/literalExpression/dollarInsideString.kt b/j2k/tests/testData/ast/literalExpression/dollarInsideString.kt
index 7a3fb485356..84cf1b11f01 100644
--- a/j2k/tests/testData/ast/literalExpression/dollarInsideString.kt
+++ b/j2k/tests/testData/ast/literalExpression/dollarInsideString.kt
@@ -1,6 +1,6 @@
 package demo
 
-class Test() {
+class Test {
     fun test() {
         var name = "$$$$"
         name = name.replaceAll("\\$[0-9]+", "\\$")
diff --git a/j2k/tests/testData/ast/literalExpression/endsWithDFL.kt b/j2k/tests/testData/ast/literalExpression/endsWithDFL.kt
index 969bf6ff0ea..ccbbd9c3b63 100644
--- a/j2k/tests/testData/ast/literalExpression/endsWithDFL.kt
+++ b/j2k/tests/testData/ast/literalExpression/endsWithDFL.kt
@@ -1,4 +1,4 @@
-class Test() {
+class Test {
     fun test() {
         val l1 = 10
         val d1 = 10.0
diff --git a/j2k/tests/testData/ast/literalExpression/hex.kt b/j2k/tests/testData/ast/literalExpression/hex.kt
index 764a4d98026..1d8bbc18bb8 100644
--- a/j2k/tests/testData/ast/literalExpression/hex.kt
+++ b/j2k/tests/testData/ast/literalExpression/hex.kt
@@ -1,4 +1,4 @@
-class Test() {
+class Test {
     fun test() {
         val i1 = 33
         val i2 = 51
diff --git a/j2k/tests/testData/ast/literalExpression/octal.kt b/j2k/tests/testData/ast/literalExpression/octal.kt
index dc68442d8ee..06b706dfb32 100644
--- a/j2k/tests/testData/ast/literalExpression/octal.kt
+++ b/j2k/tests/testData/ast/literalExpression/octal.kt
@@ -1,4 +1,4 @@
-class Test() {
+class Test {
     fun test() {
         val i1 = 37
         val i2 = 26
diff --git a/j2k/tests/testData/ast/literalExpression/trueOrFalse.kt b/j2k/tests/testData/ast/literalExpression/trueOrFalse.kt
index 326b2c6d6fd..a0db5294a2c 100644
--- a/j2k/tests/testData/ast/literalExpression/trueOrFalse.kt
+++ b/j2k/tests/testData/ast/literalExpression/trueOrFalse.kt
@@ -1,4 +1,4 @@
-class Test() {
+class Test {
     fun test() {
         val t1 = true
         val t2 = true
diff --git a/j2k/tests/testData/ast/methodCallExpression/genericMethod.kt b/j2k/tests/testData/ast/methodCallExpression/genericMethod.kt
index 78ff43f2a98..309f1246b0e 100644
--- a/j2k/tests/testData/ast/methodCallExpression/genericMethod.kt
+++ b/j2k/tests/testData/ast/methodCallExpression/genericMethod.kt
@@ -1,11 +1,11 @@
 package demo
 
-class Map() {
+class Map {
     fun <K, V> put(k: K, v: V) {
     }
 }
 
-class U() {
+class U {
     fun test() {
         val m = Map()
         m.put<String, Int>("10", 10)
diff --git a/j2k/tests/testData/ast/misc/packageWithClass.kt b/j2k/tests/testData/ast/misc/packageWithClass.kt
index 7681b2952fa..f254cfd1c83 100644
--- a/j2k/tests/testData/ast/misc/packageWithClass.kt
+++ b/j2k/tests/testData/ast/misc/packageWithClass.kt
@@ -1,3 +1,3 @@
 package test
 
-class C()
\ No newline at end of file
+class C
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/misc/packageWithClasses.kt b/j2k/tests/testData/ast/misc/packageWithClasses.kt
index 9e2da6b537c..f2097f5e516 100644
--- a/j2k/tests/testData/ast/misc/packageWithClasses.kt
+++ b/j2k/tests/testData/ast/misc/packageWithClasses.kt
@@ -1,2 +1,2 @@
-class A()
-class B()
\ No newline at end of file
+class A
+class B
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/misc/packageWithOpenClass.kt b/j2k/tests/testData/ast/misc/packageWithOpenClass.kt
index 7681b2952fa..f254cfd1c83 100644
--- a/j2k/tests/testData/ast/misc/packageWithOpenClass.kt
+++ b/j2k/tests/testData/ast/misc/packageWithOpenClass.kt
@@ -1,3 +1,3 @@
 package test
 
-class C()
\ No newline at end of file
+class C
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/newClassExpression/fullQualifiedName.kt b/j2k/tests/testData/ast/newClassExpression/fullQualifiedName.kt
index 61d3e8d4c60..524a2625d19 100644
--- a/j2k/tests/testData/ast/newClassExpression/fullQualifiedName.kt
+++ b/j2k/tests/testData/ast/newClassExpression/fullQualifiedName.kt
@@ -1,6 +1,6 @@
 package test
 
-class User() {
+class User {
     fun main() {
         val list = java.util.LinkedList()
     }
diff --git a/j2k/tests/testData/ast/newClassExpression/fullQualifiedName2.kt b/j2k/tests/testData/ast/newClassExpression/fullQualifiedName2.kt
index 61d3e8d4c60..524a2625d19 100644
--- a/j2k/tests/testData/ast/newClassExpression/fullQualifiedName2.kt
+++ b/j2k/tests/testData/ast/newClassExpression/fullQualifiedName2.kt
@@ -1,6 +1,6 @@
 package test
 
-class User() {
+class User {
     fun main() {
         val list = java.util.LinkedList()
     }
diff --git a/j2k/tests/testData/ast/newClassExpression/genericClassInvocation.kt b/j2k/tests/testData/ast/newClassExpression/genericClassInvocation.kt
index cab47c50a09..829d8b5e6ee 100644
--- a/j2k/tests/testData/ast/newClassExpression/genericClassInvocation.kt
+++ b/j2k/tests/testData/ast/newClassExpression/genericClassInvocation.kt
@@ -1,6 +1,6 @@
 import java.util.LinkedList
 
-class User() {
+class User {
     fun main() {
         val list = LinkedList<String>()
     }
diff --git a/j2k/tests/testData/ast/newClassExpression/newAnonymousClass2.kt b/j2k/tests/testData/ast/newClassExpression/newAnonymousClass2.kt
index e8d2763a65a..8bd268c94ae 100644
--- a/j2k/tests/testData/ast/newClassExpression/newAnonymousClass2.kt
+++ b/j2k/tests/testData/ast/newClassExpression/newAnonymousClass2.kt
@@ -1,6 +1,6 @@
-abstract class A()
+abstract class A
 
-class C() {
+class C {
     fun foo() {
         val a = object : A() {
             override fun toString(): String {
diff --git a/j2k/tests/testData/ast/newClassExpression/newAnonymousClass3.kt b/j2k/tests/testData/ast/newClassExpression/newAnonymousClass3.kt
index bd3ffc22d48..8b1b510ca54 100644
--- a/j2k/tests/testData/ast/newClassExpression/newAnonymousClass3.kt
+++ b/j2k/tests/testData/ast/newClassExpression/newAnonymousClass3.kt
@@ -1,6 +1,6 @@
 import kotlinApi.KotlinTrait
 
-class C() {
+class C {
     fun foo() {
         val t = object : KotlinTrait {
             override fun nullableFun(): String? {
diff --git a/j2k/tests/testData/ast/newClassExpression/newClassByFullName.kt b/j2k/tests/testData/ast/newClassExpression/newClassByFullName.kt
index 1546fb45464..0a808230939 100644
--- a/j2k/tests/testData/ast/newClassExpression/newClassByFullName.kt
+++ b/j2k/tests/testData/ast/newClassExpression/newClassByFullName.kt
@@ -1,8 +1,8 @@
 package org.test
 
-class Library()
+class Library
 
-class User() {
+class User {
     fun main() {
         val lib = Library()
     }
diff --git a/j2k/tests/testData/ast/newClassExpression/newInnerClass.kt b/j2k/tests/testData/ast/newClassExpression/newInnerClass.kt
index e7d3a2927cf..c8be6da852e 100644
--- a/j2k/tests/testData/ast/newClassExpression/newInnerClass.kt
+++ b/j2k/tests/testData/ast/newClassExpression/newInnerClass.kt
@@ -1,10 +1,10 @@
 package org.test
 
-class OuterClass() {
-    inner class InnerClass()
+class OuterClass {
+    inner class InnerClass
 }
 
-class User() {
+class User {
     fun main() {
         val outerObject = OuterClass()
         val innerObject = outerObject.InnerClass()
diff --git a/j2k/tests/testData/ast/newClassExpression/newListAndNewMember.kt b/j2k/tests/testData/ast/newClassExpression/newListAndNewMember.kt
index 031a5e051cd..99515ddeb7d 100644
--- a/j2k/tests/testData/ast/newClassExpression/newListAndNewMember.kt
+++ b/j2k/tests/testData/ast/newClassExpression/newListAndNewMember.kt
@@ -2,9 +2,9 @@ package org.test
 
 import java.util.LinkedList
 
-class Member()
+class Member
 
-class User() {
+class User {
     fun main() {
         val members = LinkedList<Member>()
         members.add(Member())
diff --git a/j2k/tests/testData/ast/newClassExpression/newStaticInnerClass.kt b/j2k/tests/testData/ast/newClassExpression/newStaticInnerClass.kt
index f55170cf603..06ef67b9c35 100644
--- a/j2k/tests/testData/ast/newClassExpression/newStaticInnerClass.kt
+++ b/j2k/tests/testData/ast/newClassExpression/newStaticInnerClass.kt
@@ -1,10 +1,10 @@
 package demo
 
-class Foo() {
-    class Bar()
+class Foo {
+    class Bar
 }
 
-class User() {
+class User {
     fun main() {
         val boo = Foo.Bar()
     }
diff --git a/j2k/tests/testData/ast/nullability/FieldAssignedWithNull.kt b/j2k/tests/testData/ast/nullability/FieldAssignedWithNull.kt
index 6d8550e67cf..94bf2521ce9 100644
--- a/j2k/tests/testData/ast/nullability/FieldAssignedWithNull.kt
+++ b/j2k/tests/testData/ast/nullability/FieldAssignedWithNull.kt
@@ -1,4 +1,4 @@
-class C() {
+class C {
     private var s: String? = ""
 
     fun foo() {
diff --git a/j2k/tests/testData/ast/nullability/FieldComparedWithNull.kt b/j2k/tests/testData/ast/nullability/FieldComparedWithNull.kt
index f959711ac1e..e872769b704 100644
--- a/j2k/tests/testData/ast/nullability/FieldComparedWithNull.kt
+++ b/j2k/tests/testData/ast/nullability/FieldComparedWithNull.kt
@@ -1,4 +1,4 @@
-class C() {
+class C {
     private val s = x()
 
     fun foo() {
diff --git a/j2k/tests/testData/ast/nullability/FieldComparedWithNull3.kt b/j2k/tests/testData/ast/nullability/FieldComparedWithNull3.kt
index 6aae2579dcd..7427ee628d9 100644
--- a/j2k/tests/testData/ast/nullability/FieldComparedWithNull3.kt
+++ b/j2k/tests/testData/ast/nullability/FieldComparedWithNull3.kt
@@ -1,8 +1,8 @@
-class C() {
+class C {
     public var s: String? = ""
 }
 
-class D() {
+class D {
     fun foo(c: C) {
         if (null == c.s) {
             System.out.println("null")
diff --git a/j2k/tests/testData/ast/nullability/FieldInitializedWithNull.kt b/j2k/tests/testData/ast/nullability/FieldInitializedWithNull.kt
index f0ace432167..866bb77f3d0 100644
--- a/j2k/tests/testData/ast/nullability/FieldInitializedWithNull.kt
+++ b/j2k/tests/testData/ast/nullability/FieldInitializedWithNull.kt
@@ -1,4 +1,4 @@
-class C() {
+class C {
     private var s: String? = null
 
     fun foo() {
diff --git a/j2k/tests/testData/ast/nullability/IndirectOverride.kt b/j2k/tests/testData/ast/nullability/IndirectOverride.kt
index d65becf9df5..fef09177b77 100644
--- a/j2k/tests/testData/ast/nullability/IndirectOverride.kt
+++ b/j2k/tests/testData/ast/nullability/IndirectOverride.kt
@@ -1,4 +1,4 @@
-class C() : javaApi.Derived() {
+class C : javaApi.Derived() {
     override fun foo(s: String?): String? {
         return s
     }
diff --git a/j2k/tests/testData/ast/nullability/MethodInvokedWithNullArg.kt b/j2k/tests/testData/ast/nullability/MethodInvokedWithNullArg.kt
index 2b784988bc6..94b09459e43 100644
--- a/j2k/tests/testData/ast/nullability/MethodInvokedWithNullArg.kt
+++ b/j2k/tests/testData/ast/nullability/MethodInvokedWithNullArg.kt
@@ -1,4 +1,4 @@
-class C() {
+class C {
     private fun foo(s: String?) {
     }
 
diff --git a/j2k/tests/testData/ast/nullability/MethodInvokedWithNullArg2.kt b/j2k/tests/testData/ast/nullability/MethodInvokedWithNullArg2.kt
index 9d8c3d6d0d9..4f9a384c53f 100644
--- a/j2k/tests/testData/ast/nullability/MethodInvokedWithNullArg2.kt
+++ b/j2k/tests/testData/ast/nullability/MethodInvokedWithNullArg2.kt
@@ -1,9 +1,9 @@
-class C() {
+class C {
     public fun foo(s: String?) {
     }
 }
 
-class D() {
+class D {
     fun bar(c: C) {
         c.foo(null)
     }
diff --git a/j2k/tests/testData/ast/nullability/MethodInvokedWithTernaryNullArg.kt b/j2k/tests/testData/ast/nullability/MethodInvokedWithTernaryNullArg.kt
index 273dedfd954..39332b41048 100644
--- a/j2k/tests/testData/ast/nullability/MethodInvokedWithTernaryNullArg.kt
+++ b/j2k/tests/testData/ast/nullability/MethodInvokedWithTernaryNullArg.kt
@@ -1,4 +1,4 @@
-class C() {
+class C {
     private fun foo(s: String?) {
     }
 
diff --git a/j2k/tests/testData/ast/nullability/MethodResultComparedWithNull.kt b/j2k/tests/testData/ast/nullability/MethodResultComparedWithNull.kt
index ed9ed55a8d3..39c39e23fa7 100644
--- a/j2k/tests/testData/ast/nullability/MethodResultComparedWithNull.kt
+++ b/j2k/tests/testData/ast/nullability/MethodResultComparedWithNull.kt
@@ -2,7 +2,7 @@ trait I {
     public fun getString(): String?
 }
 
-class C() {
+class C {
     fun foo(i: I) {
         if (i.getString() == null) {
             println("null")
diff --git a/j2k/tests/testData/ast/nullability/MethodResultComparedWithNull2.kt b/j2k/tests/testData/ast/nullability/MethodResultComparedWithNull2.kt
index 11b86f8b960..3d0e1b1c0e6 100644
--- a/j2k/tests/testData/ast/nullability/MethodResultComparedWithNull2.kt
+++ b/j2k/tests/testData/ast/nullability/MethodResultComparedWithNull2.kt
@@ -2,7 +2,7 @@ trait I {
     public fun getString(): String?
 }
 
-class C() {
+class C {
     fun foo(i: I) {
         val result = i.getString()
         if (result != null) {
diff --git a/j2k/tests/testData/ast/nullability/MethodResultComparedWithNull3.kt b/j2k/tests/testData/ast/nullability/MethodResultComparedWithNull3.kt
index 11b86f8b960..3d0e1b1c0e6 100644
--- a/j2k/tests/testData/ast/nullability/MethodResultComparedWithNull3.kt
+++ b/j2k/tests/testData/ast/nullability/MethodResultComparedWithNull3.kt
@@ -2,7 +2,7 @@ trait I {
     public fun getString(): String?
 }
 
-class C() {
+class C {
     fun foo(i: I) {
         val result = i.getString()
         if (result != null) {
diff --git a/j2k/tests/testData/ast/nullability/MethodResultComparedWithNull4.kt b/j2k/tests/testData/ast/nullability/MethodResultComparedWithNull4.kt
index eccd925c677..a9ffcf3c3c4 100644
--- a/j2k/tests/testData/ast/nullability/MethodResultComparedWithNull4.kt
+++ b/j2k/tests/testData/ast/nullability/MethodResultComparedWithNull4.kt
@@ -2,7 +2,7 @@ trait I {
     public fun getString(): String
 }
 
-class C() {
+class C {
     fun foo(i: I, b: Boolean) {
         var result: String? = i.getString()
         if (b) result = null
diff --git a/j2k/tests/testData/ast/nullability/MethodResultInitializesNullableField.kt b/j2k/tests/testData/ast/nullability/MethodResultInitializesNullableField.kt
index de5326c20b9..0f102079234 100644
--- a/j2k/tests/testData/ast/nullability/MethodResultInitializesNullableField.kt
+++ b/j2k/tests/testData/ast/nullability/MethodResultInitializesNullableField.kt
@@ -1,4 +1,4 @@
-class C() {
+class C {
     private val string = getString()
 
     class object {
diff --git a/j2k/tests/testData/ast/nullability/MethodReturnsNull.kt b/j2k/tests/testData/ast/nullability/MethodReturnsNull.kt
index 69986554f46..eda5b559c71 100644
--- a/j2k/tests/testData/ast/nullability/MethodReturnsNull.kt
+++ b/j2k/tests/testData/ast/nullability/MethodReturnsNull.kt
@@ -1,4 +1,4 @@
-class C() {
+class C {
     fun foo(b: Boolean): String? {
         if (b) {
             return "abc"
diff --git a/j2k/tests/testData/ast/nullability/MethodReturnsNullInAnonymousClass.kt b/j2k/tests/testData/ast/nullability/MethodReturnsNullInAnonymousClass.kt
index b3b27e608e2..8c38f48c389 100644
--- a/j2k/tests/testData/ast/nullability/MethodReturnsNullInAnonymousClass.kt
+++ b/j2k/tests/testData/ast/nullability/MethodReturnsNullInAnonymousClass.kt
@@ -2,7 +2,7 @@ trait Getter {
     public fun get(): String
 }
 
-class C() {
+class C {
     fun foo(b: Boolean): String {
         val getter = object : Getter {
             override fun get(): String? {
diff --git a/j2k/tests/testData/ast/nullability/MethodReturnsTernaryNull.kt b/j2k/tests/testData/ast/nullability/MethodReturnsTernaryNull.kt
index c808c4b8a1d..195b0db07cb 100644
--- a/j2k/tests/testData/ast/nullability/MethodReturnsTernaryNull.kt
+++ b/j2k/tests/testData/ast/nullability/MethodReturnsTernaryNull.kt
@@ -1,4 +1,4 @@
-class C() {
+class C {
     fun foo(b: Boolean): String? {
         return if (b) "abc" else null
     }
diff --git a/j2k/tests/testData/ast/nullability/NullableIntNoCrash.kt b/j2k/tests/testData/ast/nullability/NullableIntNoCrash.kt
index 83dda3a4ae5..6f87f2a411f 100644
--- a/j2k/tests/testData/ast/nullability/NullableIntNoCrash.kt
+++ b/j2k/tests/testData/ast/nullability/NullableIntNoCrash.kt
@@ -1,4 +1,4 @@
-class A() {
+class A {
     var field = foo()
 
     fun foo(): Int {
diff --git a/j2k/tests/testData/ast/nullability/NullableMethodDotAccess.kt b/j2k/tests/testData/ast/nullability/NullableMethodDotAccess.kt
index 4bef51b9f32..efcc16af0d3 100644
--- a/j2k/tests/testData/ast/nullability/NullableMethodDotAccess.kt
+++ b/j2k/tests/testData/ast/nullability/NullableMethodDotAccess.kt
@@ -1,4 +1,4 @@
-class C() {
+class C {
     fun getString(b: Boolean): String? {
         return if (b) "a" else null
     }
diff --git a/j2k/tests/testData/ast/nullability/OverrideWithInheritanceLoop.kt b/j2k/tests/testData/ast/nullability/OverrideWithInheritanceLoop.kt
index b4577d0e5d0..1f9c8d55c74 100644
--- a/j2k/tests/testData/ast/nullability/OverrideWithInheritanceLoop.kt
+++ b/j2k/tests/testData/ast/nullability/OverrideWithInheritanceLoop.kt
@@ -1,9 +1,9 @@
-class A() : B() {
+class A : B() {
     public fun foo(s: String) {
     }
 }
 
-class B() : A() {
+class B : A() {
     public fun foo(s: String) {
     }
 }
diff --git a/j2k/tests/testData/ast/nullability/Overrides.kt b/j2k/tests/testData/ast/nullability/Overrides.kt
index 0158b9f0f68..0de4a733e56 100644
--- a/j2k/tests/testData/ast/nullability/Overrides.kt
+++ b/j2k/tests/testData/ast/nullability/Overrides.kt
@@ -1,4 +1,4 @@
-class Base() {
+class Base {
     public fun foo(s: String?): String? {
         return ""
     }
@@ -16,7 +16,7 @@ trait I {
     public fun zoo(o: Any?): String?
 }
 
-class C() : Base(), I {
+class C : Base(), I {
     override fun foo(s: String?): String? {
         return ""
     }
diff --git a/j2k/tests/testData/ast/objectLiteral/MyFrame.kt b/j2k/tests/testData/ast/objectLiteral/MyFrame.kt
index 7a00100c269..7d65c1acda7 100644
--- a/j2k/tests/testData/ast/objectLiteral/MyFrame.kt
+++ b/j2k/tests/testData/ast/objectLiteral/MyFrame.kt
@@ -1,11 +1,11 @@
 package demo
 
-class WindowAdapter() {
+class WindowAdapter {
     public fun windowClosing() {
     }
 }
 
-public class Client() : Frame() {
+public class Client : Frame() {
     {
         val a = object : WindowAdapter() {
             override fun windowClosing() {
diff --git a/j2k/tests/testData/ast/packageStatement/orgJetbrainsJetJ2kIn.kt b/j2k/tests/testData/ast/packageStatement/orgJetbrainsJetJ2kIn.kt
index 48886e8330d..a789c877b1d 100644
--- a/j2k/tests/testData/ast/packageStatement/orgJetbrainsJetJ2kIn.kt
+++ b/j2k/tests/testData/ast/packageStatement/orgJetbrainsJetJ2kIn.kt
@@ -1,3 +1,3 @@
 package org.jetbrains.jet.j2k.`in`
 
-public class Converter()
\ No newline at end of file
+public class Converter
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/rawGenerics/kt-540-map.kt b/j2k/tests/testData/ast/rawGenerics/kt-540-map.kt
index 218ae4d0df5..ac95653b9f8 100644
--- a/j2k/tests/testData/ast/rawGenerics/kt-540-map.kt
+++ b/j2k/tests/testData/ast/rawGenerics/kt-540-map.kt
@@ -2,7 +2,7 @@ package demo
 
 import java.util.HashMap
 
-class Test() {
+class Test {
     fun main() {
         val commonMap = HashMap<String, Int>()
         val rawMap = HashMap<String, Int>()
diff --git a/j2k/tests/testData/ast/rawGenerics/kt-540-rawGenericClass.kt b/j2k/tests/testData/ast/rawGenerics/kt-540-rawGenericClass.kt
index 73b9e947035..119a2792c5c 100644
--- a/j2k/tests/testData/ast/rawGenerics/kt-540-rawGenericClass.kt
+++ b/j2k/tests/testData/ast/rawGenerics/kt-540-rawGenericClass.kt
@@ -6,7 +6,7 @@ class Collection<E>(e: E) {
     }
 }
 
-class Test() {
+class Test {
     fun main() {
         val raw1 = Collection(1)
         val raw2 = Collection<Int>(1)
diff --git a/j2k/tests/testData/ast/rawGenerics/kt-540.kt b/j2k/tests/testData/ast/rawGenerics/kt-540.kt
index 716b971d661..3c33ceb249a 100644
--- a/j2k/tests/testData/ast/rawGenerics/kt-540.kt
+++ b/j2k/tests/testData/ast/rawGenerics/kt-540.kt
@@ -2,7 +2,7 @@ package demo
 
 import java.util.LinkedList
 
-class Test() {
+class Test {
     fun main() {
         val common = LinkedList<String>()
         val raw = LinkedList<String>()
diff --git a/j2k/tests/testData/ast/rawGenerics/rawGenericMethod.kt b/j2k/tests/testData/ast/rawGenerics/rawGenericMethod.kt
index d866f64fa78..c20349f17d4 100644
--- a/j2k/tests/testData/ast/rawGenerics/rawGenericMethod.kt
+++ b/j2k/tests/testData/ast/rawGenerics/rawGenericMethod.kt
@@ -1,11 +1,11 @@
 package demo
 
-class TestT() {
+class TestT {
     fun <T> getT() {
     }
 }
 
-class U() {
+class U {
     fun main() {
         val t = TestT()
         t.getT<String>()
diff --git a/j2k/tests/testData/ast/returnStatement/currentMethodBug.kt b/j2k/tests/testData/ast/returnStatement/currentMethodBug.kt
index 1b5e724938a..2a185cd59fc 100644
--- a/j2k/tests/testData/ast/returnStatement/currentMethodBug.kt
+++ b/j2k/tests/testData/ast/returnStatement/currentMethodBug.kt
@@ -2,7 +2,7 @@ trait I {
     public fun getInt(): Int
 }
 
-class C() {
+class C {
     fun getObject(): Any? {
         foo(object : I {
             override fun getInt(): Int {
diff --git a/j2k/tests/testData/ast/settings/openByDefault.kt b/j2k/tests/testData/ast/settings/openByDefault.kt
index a801e876617..e71cc2b33ce 100644
--- a/j2k/tests/testData/ast/settings/openByDefault.kt
+++ b/j2k/tests/testData/ast/settings/openByDefault.kt
@@ -1,6 +1,6 @@
 // !openByDefault: true
 
-open class A() {
+open class A {
     open fun foo1() {
     }
     private fun foo2() {
@@ -9,12 +9,12 @@ open class A() {
     }
 }
 
-class B() {
+class B {
     fun foo() {
     }
 }
 
-abstract class C() {
+abstract class C {
     abstract fun foo()
 }
 
@@ -22,7 +22,7 @@ trait I {
     public fun foo()
 }
 
-open class D() : I {
+open class D : I {
     override fun foo() {
     }
 }
diff --git a/j2k/tests/testData/ast/settings/specifyFieldTypeByDefault.kt b/j2k/tests/testData/ast/settings/specifyFieldTypeByDefault.kt
index 72942153033..7ed0f8f39f2 100644
--- a/j2k/tests/testData/ast/settings/specifyFieldTypeByDefault.kt
+++ b/j2k/tests/testData/ast/settings/specifyFieldTypeByDefault.kt
@@ -2,7 +2,7 @@
 import java.util.*
 import kotlin.List
 
-class A() {
+class A {
     private val field1: List<String> = ArrayList<String>()
     val field2: List<String> = ArrayList<String>()
     public val field3: Int = 0
diff --git a/j2k/tests/testData/ast/staticMembers/PrivateStaticMembers.kt b/j2k/tests/testData/ast/staticMembers/PrivateStaticMembers.kt
index b44c55a1b3e..b7ff9131118 100644
--- a/j2k/tests/testData/ast/staticMembers/PrivateStaticMembers.kt
+++ b/j2k/tests/testData/ast/staticMembers/PrivateStaticMembers.kt
@@ -1,4 +1,4 @@
-class A() {
+class A {
 
     public fun foo() {
         privateStatic1()
diff --git a/j2k/tests/testData/ast/staticMembers/PrivateStaticMethods1.kt b/j2k/tests/testData/ast/staticMembers/PrivateStaticMethods1.kt
index 229e28304da..011897bd66c 100644
--- a/j2k/tests/testData/ast/staticMembers/PrivateStaticMethods1.kt
+++ b/j2k/tests/testData/ast/staticMembers/PrivateStaticMethods1.kt
@@ -1,4 +1,4 @@
-class A() {
+class A {
     public fun foo() {
         privateStatic1()
         privateStatic2()
diff --git a/j2k/tests/testData/ast/staticMembers/PrivateStaticMethods2.kt b/j2k/tests/testData/ast/staticMembers/PrivateStaticMethods2.kt
index 3b82bb877b5..9ad221c117c 100644
--- a/j2k/tests/testData/ast/staticMembers/PrivateStaticMethods2.kt
+++ b/j2k/tests/testData/ast/staticMembers/PrivateStaticMethods2.kt
@@ -1,4 +1,4 @@
-class A() {
+class A {
     public fun foo() {
         privateStatic1()
         privateStatic2()
diff --git a/j2k/tests/testData/ast/staticMembers/PrivateStaticMethods3.kt b/j2k/tests/testData/ast/staticMembers/PrivateStaticMethods3.kt
index 6790b6973dd..8a33e77b6f6 100644
--- a/j2k/tests/testData/ast/staticMembers/PrivateStaticMethods3.kt
+++ b/j2k/tests/testData/ast/staticMembers/PrivateStaticMethods3.kt
@@ -1,5 +1,5 @@
-class A() {
-    public class Nested() {
+class A {
+    public class Nested {
         fun foo() {
             privateStatic1()
         }
diff --git a/j2k/tests/testData/ast/staticMembers/PrivateStaticMethods4.kt b/j2k/tests/testData/ast/staticMembers/PrivateStaticMethods4.kt
index 31929271185..bc9aee776e8 100644
--- a/j2k/tests/testData/ast/staticMembers/PrivateStaticMethods4.kt
+++ b/j2k/tests/testData/ast/staticMembers/PrivateStaticMethods4.kt
@@ -1,5 +1,5 @@
-class A() {
-    public inner class Inner() {
+class A {
+    public inner class Inner {
         fun foo() {
             privateStatic1()
         }
diff --git a/j2k/tests/testData/ast/superExpression/classAdotSuperFoo.kt b/j2k/tests/testData/ast/superExpression/classAdotSuperFoo.kt
index 1585ecae8d1..1d3d673500c 100644
--- a/j2k/tests/testData/ast/superExpression/classAdotSuperFoo.kt
+++ b/j2k/tests/testData/ast/superExpression/classAdotSuperFoo.kt
@@ -1,11 +1,11 @@
 package a.b
 
-class Base() {
+class Base {
     fun foo()
 }
 
-class A() : Base() {
-    inner class C() {
+class A : Base() {
+    inner class C {
         fun test() {
             super@A.foo()
         }
diff --git a/j2k/tests/testData/ast/superExpression/classAextendsB.kt b/j2k/tests/testData/ast/superExpression/classAextendsB.kt
index 4ceeedfcf65..b6772964266 100644
--- a/j2k/tests/testData/ast/superExpression/classAextendsB.kt
+++ b/j2k/tests/testData/ast/superExpression/classAextendsB.kt
@@ -4,7 +4,7 @@ class B(i: Int) {
     }
 }
 
-class A() : B(10) {
+class A : B(10) {
 
     override fun call(): Int {
         return super.call()
diff --git a/j2k/tests/testData/ast/switch/comlicatedFallDown.kt b/j2k/tests/testData/ast/switch/comlicatedFallDown.kt
index ec12eb47a04..4e6ccabb380 100644
--- a/j2k/tests/testData/ast/switch/comlicatedFallDown.kt
+++ b/j2k/tests/testData/ast/switch/comlicatedFallDown.kt
@@ -1,6 +1,6 @@
 package demo
 
-public class SwitchDemo() {
+public class SwitchDemo {
     class object {
         public fun print(o: Any) {
             System.out.println(o)
diff --git a/j2k/tests/testData/ast/switch/emptySwitch.kt b/j2k/tests/testData/ast/switch/emptySwitch.kt
index eb104015720..dcb6aad751b 100644
--- a/j2k/tests/testData/ast/switch/emptySwitch.kt
+++ b/j2k/tests/testData/ast/switch/emptySwitch.kt
@@ -1,4 +1,4 @@
-public class NonDefault() {
+public class NonDefault {
     class object {
         public fun main(args: Array<String>) {
 
diff --git a/j2k/tests/testData/ast/switch/fallDown.kt b/j2k/tests/testData/ast/switch/fallDown.kt
index 9a55b06ec8d..1b74f96466b 100644
--- a/j2k/tests/testData/ast/switch/fallDown.kt
+++ b/j2k/tests/testData/ast/switch/fallDown.kt
@@ -1,6 +1,6 @@
 package switch_demo
 
-public class SwitchDemo() {
+public class SwitchDemo {
     class object {
         public fun main(args: Array<String>) {
             val month = 8
diff --git a/j2k/tests/testData/ast/switch/kt-539.kt b/j2k/tests/testData/ast/switch/kt-539.kt
index b0104470441..103176085ec 100644
--- a/j2k/tests/testData/ast/switch/kt-539.kt
+++ b/j2k/tests/testData/ast/switch/kt-539.kt
@@ -1,6 +1,6 @@
 package switch_demo
 
-public class SwitchDemo() {
+public class SwitchDemo {
     class object {
         public fun main(args: Array<String>) {
 
diff --git a/j2k/tests/testData/ast/switch/nondefault.kt b/j2k/tests/testData/ast/switch/nondefault.kt
index 07fafe47ae4..11fca34208a 100644
--- a/j2k/tests/testData/ast/switch/nondefault.kt
+++ b/j2k/tests/testData/ast/switch/nondefault.kt
@@ -1,4 +1,4 @@
-public class NonDefault() {
+public class NonDefault {
     class object {
         public fun main(args: Array<String>) {
 
diff --git a/j2k/tests/testData/ast/thisExpression/classAdotThisFoo.kt b/j2k/tests/testData/ast/thisExpression/classAdotThisFoo.kt
index f32bed7d370..32061eb0950 100644
--- a/j2k/tests/testData/ast/thisExpression/classAdotThisFoo.kt
+++ b/j2k/tests/testData/ast/thisExpression/classAdotThisFoo.kt
@@ -1,12 +1,12 @@
 package a.b
 
-class Base() {
+class Base {
     fun foo() {
     }
 }
 
-class A() : Base() {
-    inner class C() {
+class A : Base() {
+    inner class C {
         fun test() {
             this@A.foo()
         }
diff --git a/j2k/tests/testData/ast/toKotlinClasses/TypeParameterBound.kt b/j2k/tests/testData/ast/toKotlinClasses/TypeParameterBound.kt
index f385c2f6829..89db7b8c731 100644
--- a/j2k/tests/testData/ast/toKotlinClasses/TypeParameterBound.kt
+++ b/j2k/tests/testData/ast/toKotlinClasses/TypeParameterBound.kt
@@ -4,4 +4,4 @@ import kotlin.Iterator
 
 trait I<T : List<Iterator<String>>>
 
-class C() : I<ArrayList<Iterator<String>>>
+class C : I<ArrayList<Iterator<String>>>
diff --git a/j2k/tests/testData/ast/toKotlinClasses/iterableAndIterator.kt b/j2k/tests/testData/ast/toKotlinClasses/iterableAndIterator.kt
index f79f1671b27..c9f5b87c84b 100644
--- a/j2k/tests/testData/ast/toKotlinClasses/iterableAndIterator.kt
+++ b/j2k/tests/testData/ast/toKotlinClasses/iterableAndIterator.kt
@@ -1,6 +1,6 @@
 package demo
 
-class Test() : Iterable<String> {
+class Test : Iterable<String> {
     override fun iterator(): Iterator<String> {
         return null
     }
@@ -11,7 +11,7 @@ class Test() : Iterable<String> {
     }
 }
 
-class FullTest() : Iterable<String> {
+class FullTest : Iterable<String> {
     override fun iterator(): Iterator<String> {
         return null
     }
diff --git a/j2k/tests/testData/ast/toKotlinClasses/iterableAndIterator2.kt b/j2k/tests/testData/ast/toKotlinClasses/iterableAndIterator2.kt
index 8b67cc579ff..7a2ce282b3c 100644
--- a/j2k/tests/testData/ast/toKotlinClasses/iterableAndIterator2.kt
+++ b/j2k/tests/testData/ast/toKotlinClasses/iterableAndIterator2.kt
@@ -3,7 +3,7 @@ package demo
 import java.util.*
 import kotlin.Iterator
 
-class Test() : Iterable<String> {
+class Test : Iterable<String> {
     override fun iterator(): Iterator<String> {
         return null
     }
@@ -14,7 +14,7 @@ class Test() : Iterable<String> {
     }
 }
 
-class FullTest() : Iterable<String> {
+class FullTest : Iterable<String> {
     override fun iterator(): Iterator<String> {
         return null
     }
diff --git a/j2k/tests/testData/ast/toKotlinClasses/iterableAndIterator3.kt b/j2k/tests/testData/ast/toKotlinClasses/iterableAndIterator3.kt
index aa403e69e79..55f8a999a12 100644
--- a/j2k/tests/testData/ast/toKotlinClasses/iterableAndIterator3.kt
+++ b/j2k/tests/testData/ast/toKotlinClasses/iterableAndIterator3.kt
@@ -1,6 +1,6 @@
 package demo
 
-class Test() : Iterable<String> {
+class Test : Iterable<String> {
     override fun iterator(): Iterator<String> {
         return null
     }
diff --git a/j2k/tests/testData/ast/tryWithResource/Multiline.kt b/j2k/tests/testData/ast/tryWithResource/Multiline.kt
index 2a9e653db33..efa59c079f0 100644
--- a/j2k/tests/testData/ast/tryWithResource/Multiline.kt
+++ b/j2k/tests/testData/ast/tryWithResource/Multiline.kt
@@ -1,6 +1,6 @@
 import java.io.*
 
-public class C() {
+public class C {
     throws(javaClass<IOException>())
     fun foo() {
         FileInputStream("foo").use { stream ->
diff --git a/j2k/tests/testData/ast/tryWithResource/MultipleResources.kt b/j2k/tests/testData/ast/tryWithResource/MultipleResources.kt
index 9e4868f4566..12ac64beb17 100644
--- a/j2k/tests/testData/ast/tryWithResource/MultipleResources.kt
+++ b/j2k/tests/testData/ast/tryWithResource/MultipleResources.kt
@@ -1,6 +1,6 @@
 import java.io.*
 
-public class C() {
+public class C {
     throws(javaClass<IOException>())
     fun foo() {
         FileInputStream("foo").use { input ->
diff --git a/j2k/tests/testData/ast/tryWithResource/Simple.kt b/j2k/tests/testData/ast/tryWithResource/Simple.kt
index 40a727ec4c0..e87e818b3b4 100644
--- a/j2k/tests/testData/ast/tryWithResource/Simple.kt
+++ b/j2k/tests/testData/ast/tryWithResource/Simple.kt
@@ -1,6 +1,6 @@
 import java.io.*
 
-public class C() {
+public class C {
     throws(javaClass<IOException>())
     fun foo() {
         FileInputStream("foo").use { stream -> System.out.println(stream.read()) }
diff --git a/j2k/tests/testData/ast/tryWithResource/WithCatch.kt b/j2k/tests/testData/ast/tryWithResource/WithCatch.kt
index dbce19f57cf..02d59506ec5 100644
--- a/j2k/tests/testData/ast/tryWithResource/WithCatch.kt
+++ b/j2k/tests/testData/ast/tryWithResource/WithCatch.kt
@@ -1,6 +1,6 @@
 import java.io.*
 
-public class C() {
+public class C {
     fun foo() {
         try {
             FileInputStream("foo").use { stream ->
diff --git a/j2k/tests/testData/ast/tryWithResource/WithCatchAndFinally.kt b/j2k/tests/testData/ast/tryWithResource/WithCatchAndFinally.kt
index 0f2747e0540..e857c40cd6f 100644
--- a/j2k/tests/testData/ast/tryWithResource/WithCatchAndFinally.kt
+++ b/j2k/tests/testData/ast/tryWithResource/WithCatchAndFinally.kt
@@ -1,6 +1,6 @@
 import java.io.*
 
-public class C() {
+public class C {
     fun foo() {
         try {
             FileInputStream("foo").use { stream ->
diff --git a/j2k/tests/testData/ast/tryWithResource/WithCatches.kt b/j2k/tests/testData/ast/tryWithResource/WithCatches.kt
index 87634a2cf45..a06142a7785 100644
--- a/j2k/tests/testData/ast/tryWithResource/WithCatches.kt
+++ b/j2k/tests/testData/ast/tryWithResource/WithCatches.kt
@@ -1,6 +1,6 @@
 import java.io.*
 
-public class C() {
+public class C {
     fun foo() {
         try {
             FileInputStream("foo").use { stream ->
diff --git a/j2k/tests/testData/ast/tryWithResource/WithFinally.kt b/j2k/tests/testData/ast/tryWithResource/WithFinally.kt
index 79df2e2cd39..0e974bce707 100644
--- a/j2k/tests/testData/ast/tryWithResource/WithFinally.kt
+++ b/j2k/tests/testData/ast/tryWithResource/WithFinally.kt
@@ -1,6 +1,6 @@
 import java.io.*
 
-public class C() {
+public class C {
     throws(javaClass<IOException>())
     fun foo() {
         try {
diff --git a/j2k/tests/testData/ast/tryWithResource/WithReturnAtEnd.kt b/j2k/tests/testData/ast/tryWithResource/WithReturnAtEnd.kt
index f9fdc00d481..381c88b9fe6 100644
--- a/j2k/tests/testData/ast/tryWithResource/WithReturnAtEnd.kt
+++ b/j2k/tests/testData/ast/tryWithResource/WithReturnAtEnd.kt
@@ -1,6 +1,6 @@
 import java.io.*
 
-public class C() {
+public class C {
     fun foo(): Int {
         try {
             return FileInputStream("foo").use { stream ->
diff --git a/j2k/tests/testData/ast/tryWithResource/WithReturnInAnonymousClass.kt b/j2k/tests/testData/ast/tryWithResource/WithReturnInAnonymousClass.kt
index 304f88ac3af..281e84f9faa 100644
--- a/j2k/tests/testData/ast/tryWithResource/WithReturnInAnonymousClass.kt
+++ b/j2k/tests/testData/ast/tryWithResource/WithReturnInAnonymousClass.kt
@@ -5,7 +5,7 @@ trait I {
     public fun doIt(stream: InputStream): Int
 }
 
-public class C() {
+public class C {
     throws(javaClass<IOException>())
     fun foo() {
         FileInputStream("foo").use { stream ->
diff --git a/j2k/tests/testData/ast/tryWithResource/WithReturnInAnonymousClass2.kt b/j2k/tests/testData/ast/tryWithResource/WithReturnInAnonymousClass2.kt
index 0b06d409b5d..32860dfb2b3 100644
--- a/j2k/tests/testData/ast/tryWithResource/WithReturnInAnonymousClass2.kt
+++ b/j2k/tests/testData/ast/tryWithResource/WithReturnInAnonymousClass2.kt
@@ -5,7 +5,7 @@ trait I {
     public fun doIt(stream: InputStream): Int
 }
 
-public class C() {
+public class C {
     throws(javaClass<IOException>())
     fun foo(): Int {
         return FileInputStream("foo").use { stream ->
diff --git a/j2k/tests/testData/ast/typeParameters/classDoubleParametrizationWithTwoBoundsWithExtending.kt b/j2k/tests/testData/ast/typeParameters/classDoubleParametrizationWithTwoBoundsWithExtending.kt
index abc1138c735..aeb0a6a77e2 100644
--- a/j2k/tests/testData/ast/typeParameters/classDoubleParametrizationWithTwoBoundsWithExtending.kt
+++ b/j2k/tests/testData/ast/typeParameters/classDoubleParametrizationWithTwoBoundsWithExtending.kt
@@ -1 +1 @@
-class CC<T : INode, K : Node>() : A() where T : Comparable<in T>, K : Collection<in K>
\ No newline at end of file
+class CC<T : INode, K : Node> : A() where T : Comparable<in T>, K : Collection<in K>
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/typeParameters/classParametrizationWithTwoBounds.kt b/j2k/tests/testData/ast/typeParameters/classParametrizationWithTwoBounds.kt
index 3e52cd0539d..0ec861c5e35 100644
--- a/j2k/tests/testData/ast/typeParameters/classParametrizationWithTwoBounds.kt
+++ b/j2k/tests/testData/ast/typeParameters/classParametrizationWithTwoBounds.kt
@@ -1 +1 @@
-class C<T : INode>() where T : Comparable<in T>
\ No newline at end of file
+class C<T : INode> where T : Comparable<in T>
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/typeParameters/classParametrizationWithTwoBoundsWithExtending.kt b/j2k/tests/testData/ast/typeParameters/classParametrizationWithTwoBoundsWithExtending.kt
index 43cd7f4fc3a..9b484da7ed7 100644
--- a/j2k/tests/testData/ast/typeParameters/classParametrizationWithTwoBoundsWithExtending.kt
+++ b/j2k/tests/testData/ast/typeParameters/classParametrizationWithTwoBoundsWithExtending.kt
@@ -1 +1 @@
-class C<T : INode>() : A() where T : Comparable<in T>
\ No newline at end of file
+class C<T : INode> : A() where T : Comparable<in T>
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/typeParameters/genericClass.kt b/j2k/tests/testData/ast/typeParameters/genericClass.kt
index e43deaba778..746e4d72cd9 100644
--- a/j2k/tests/testData/ast/typeParameters/genericClass.kt
+++ b/j2k/tests/testData/ast/typeParameters/genericClass.kt
@@ -1 +1 @@
-class Comparable<T>()
\ No newline at end of file
+class Comparable<T>
\ No newline at end of file