diff --git a/j2k/src/org/jetbrains/jet/j2k/Converter.kt b/j2k/src/org/jetbrains/jet/j2k/Converter.kt
index 08f8da6a5b7..1d95f94608f 100644
--- a/j2k/src/org/jetbrains/jet/j2k/Converter.kt
+++ b/j2k/src/org/jetbrains/jet/j2k/Converter.kt
@@ -108,7 +108,7 @@ public class Converter(val project: Project, val settings: ConverterSettings) {
     }
 
     private fun convertClass(psiClass: PsiClass): Class {
-        val modifiers = convertModifierList(psiClass.getModifierList())
+        val modifiers = convertModifiers(psiClass)
         val typeParameters = convertTypeParameterList(psiClass.getTypeParameterList())
         val implementsTypes = convertToNotNullableTypes(psiClass.getImplementsListTypes())
         val extendsTypes = convertToNotNullableTypes(psiClass.getExtendsListTypes())
@@ -137,7 +137,7 @@ public class Converter(val project: Project, val settings: ConverterSettings) {
                     }
                 }
 
-                if (settings.openByDefault && !modifiers.contains(Modifier.FINAL)) {
+                if (settings.openByDefault && !psiClass.hasModifierProperty(PsiModifier.FINAL)) {
                     modifiers.add(Modifier.OPEN)
                 }
 
@@ -147,7 +147,7 @@ public class Converter(val project: Project, val settings: ConverterSettings) {
     }
 
     private fun generateArtificialPrimaryConstructor(className: Identifier, classBodyElements: MutableList<Element>) {
-        val finalOrWithEmptyInitializerFields = classBodyElements.filterIsInstance(javaClass<Field>()).filter { it.isVal() || it.initializer.toKotlin().isEmpty() }
+        val finalOrWithEmptyInitializerFields = classBodyElements.filterIsInstance(javaClass<Field>()).filter { it.isVal || it.initializer.toKotlin().isEmpty() }
         val initializers = HashMap<String, String>()
         for (element in classBodyElements) {
             if (element is SecondaryConstructor) {
@@ -185,7 +185,7 @@ public class Converter(val project: Project, val settings: ConverterSettings) {
 
         //TODO: comments?
         val parameters = finalOrWithEmptyInitializerFields.map { field ->
-            val varValModifier = if (field.modifiers.contains(Modifier.FINAL)) Parameter.VarValModifier.Val else Parameter.VarValModifier.Var
+            val varValModifier = if (field.isVal) Parameter.VarValModifier.Val else Parameter.VarValModifier.Var
             Parameter(field.identifier, field.`type`, varValModifier, field.modifiers.filter { ACCESS_MODIFIERS.contains(it) })
         }
         classBodyElements.add(PrimaryConstructor(this,
@@ -197,11 +197,11 @@ public class Converter(val project: Project, val settings: ConverterSettings) {
     }
 
     private fun convertInitializer(initializer: PsiClassInitializer): Initializer {
-        return Initializer(convertBlock(initializer.getBody()), convertModifierList(initializer.getModifierList()))
+        return Initializer(convertBlock(initializer.getBody()), convertModifiers(initializer))
     }
 
     private fun convertField(field: PsiField): Field {
-        val modifiers = convertModifierList(field.getModifierList())
+        val modifiers = convertModifiers(field)
         if (field is PsiEnumConstant) {
             return EnumConstant(Identifier(field.getName()!!),
                                 getComments(field),
@@ -210,8 +210,9 @@ public class Converter(val project: Project, val settings: ConverterSettings) {
                                 convertElement(field.getArgumentList()))
         }
 
+        val isFinal = field.hasModifierProperty(PsiModifier.FINAL)
         var kType = convertVariableType(field)
-        if (field.hasModifierProperty(PsiModifier.FINAL) && field.getInitializer().isDefinitelyNotNull()) {
+        if (isFinal && field.getInitializer().isDefinitelyNotNull()) {
             kType = kType.toNotNullType();
         }
 
@@ -220,6 +221,7 @@ public class Converter(val project: Project, val settings: ConverterSettings) {
                      modifiers,
                      kType,
                      convertExpression(field.getInitializer(), field.getType()),
+                     isFinal,
                      field.countWriteAccesses(field.getContainingClass()))
     }
 
@@ -235,12 +237,11 @@ public class Converter(val project: Project, val settings: ConverterSettings) {
             methodReturnType = method.getReturnType()
             val returnType = convertType(method.getReturnType(), method.isAnnotatedAsNotNull())
 
-            val modifiers = convertModifierList(method.getModifierList())
+            val modifiers = convertModifiers(method)
 
             val containingClass = method.getContainingClass()
-            if (containingClass != null && (containingClass.hasModifierProperty(PsiModifier.FINAL) || containingClass.isEnum())) {
-                modifiers.add(Modifier.FINAL)
-            }
+            val isEffectivelyFinal = method.hasModifierProperty(PsiModifier.FINAL) ||
+                    containingClass != null && (containingClass.hasModifierProperty(PsiModifier.FINAL) || containingClass.isEnum())
 
             if (isOverride(method)) {
                 modifiers.add(Modifier.OVERRIDE)
@@ -248,7 +249,7 @@ public class Converter(val project: Project, val settings: ConverterSettings) {
 
             if (settings.openByDefault &&
                     !modifiers.contains(Modifier.ABSTRACT) &&
-                    !modifiers.contains(Modifier.FINAL) &&
+                    !isEffectivelyFinal &&
                     !modifiers.contains(Modifier.PRIVATE)) {
                 modifiers.add(Modifier.OPEN)
             }
@@ -314,7 +315,7 @@ public class Converter(val project: Project, val settings: ConverterSettings) {
                 Parameter(Identifier(field.getName()!!),
                           convertVariableType(it),
                           if (field.hasModifierProperty(PsiModifier.FINAL)) Parameter.VarValModifier.Val else Parameter.VarValModifier.Var,
-                          convertModifierList(field.getModifierList()).filter { ACCESS_MODIFIERS.contains(it) })
+                          convertModifiers(field).filter { ACCESS_MODIFIERS.contains(it) })
             }
         })
         return PrimaryConstructor(this, comments, modifiers, parameterList, block)
@@ -494,32 +495,16 @@ public class Converter(val project: Project, val settings: ConverterSettings) {
         return Identifier(identifier.getText()!!)
     }
 
-    public fun convertModifierList(modifierList: PsiModifierList?): MutableSet<Modifier> {
-        if (modifierList == null) return HashSet()
+    public fun convertModifiers(owner: PsiModifierListOwner): MutableSet<Modifier>
+            = HashSet(MODIFIERS_MAP.filter { owner.hasModifierProperty(it.first) }.map { it.second })
 
-        val modifiersSet = HashSet<Modifier>()
-
-        //TODO: map
-        if (modifierList.hasModifierProperty(PsiModifier.ABSTRACT))
-            modifiersSet.add(Modifier.ABSTRACT)
-
-        if (modifierList.hasModifierProperty(PsiModifier.FINAL))
-            modifiersSet.add(Modifier.FINAL)
-
-        if (modifierList.hasModifierProperty(PsiModifier.STATIC))
-            modifiersSet.add(Modifier.STATIC)
-
-        if (modifierList.hasModifierProperty(PsiModifier.PUBLIC))
-            modifiersSet.add(Modifier.PUBLIC)
-
-        if (modifierList.hasModifierProperty(PsiModifier.PROTECTED))
-            modifiersSet.add(Modifier.PROTECTED)
-
-        if (modifierList.hasModifierProperty(PsiModifier.PRIVATE))
-            modifiersSet.add(Modifier.PRIVATE)
-
-        return modifiersSet
-    }
+    private val MODIFIERS_MAP = listOf(
+            PsiModifier.ABSTRACT to Modifier.ABSTRACT,
+            PsiModifier.STATIC to Modifier.STATIC,
+            PsiModifier.PUBLIC to Modifier.PUBLIC,
+            PsiModifier.PROTECTED to Modifier.PROTECTED,
+            PsiModifier.PRIVATE to Modifier.PRIVATE
+    )
 
     private val TYPE_MAP: Map<String, String> = mapOf(
             JAVA_LANG_BYTE to "byte",
diff --git a/j2k/src/org/jetbrains/jet/j2k/ast/EnumConstant.kt b/j2k/src/org/jetbrains/jet/j2k/ast/EnumConstant.kt
index fe208f355a7..81d4aa2c314 100644
--- a/j2k/src/org/jetbrains/jet/j2k/ast/EnumConstant.kt
+++ b/j2k/src/org/jetbrains/jet/j2k/ast/EnumConstant.kt
@@ -22,7 +22,7 @@ open class EnumConstant(
         modifiers: Set<Modifier>,
         `type`: Type,
         params: Element
-) : Field(identifier, members, modifiers, `type`.toNotNullType(), params, 0) {
+) : Field(identifier, members, modifiers, `type`.toNotNullType(), params, true, 0) {
 
     override fun toKotlin(): String {
         if (initializer.toKotlin().isEmpty()) {
diff --git a/j2k/src/org/jetbrains/jet/j2k/ast/Field.kt b/j2k/src/org/jetbrains/jet/j2k/ast/Field.kt
index 13b17d439c3..ccec474dfe0 100644
--- a/j2k/src/org/jetbrains/jet/j2k/ast/Field.kt
+++ b/j2k/src/org/jetbrains/jet/j2k/ast/Field.kt
@@ -25,6 +25,7 @@ open class Field(
         modifiers: Set<Modifier>,
         val `type`: Type,
         val initializer: Element,
+        val isVal: Boolean,
         val writingAccesses: Int
 ) : Member(comments, modifiers) {
 
@@ -36,18 +37,16 @@ open class Field(
 
         modifiers.accessModifier()?.let { modifierList.add(it) }
 
-        return modifierList.toKotlin() + (if (isVal()) "val " else "var ")
+        return modifierList.toKotlin() + (if (isVal) "val " else "var ")
     }
 
-    fun isVal(): Boolean = modifiers.contains(Modifier.FINAL)
-
     override fun toKotlin(): String {
-        val declaration: String = commentsToKotlin() +
-        modifiersToKotlin() + identifier.toKotlin() + " : " + `type`.toKotlin()
+        val declaration = commentsToKotlin() + modifiersToKotlin() + identifier.toKotlin() + " : " + `type`.toKotlin()
         if (initializer.isEmpty) {
-            return declaration + (if (isVal() && !isStatic() && writingAccesses != 0) "" else " = " + getDefaultInitializer(this))
+            return declaration + (if (isVal && !isStatic() && writingAccesses != 0) "" else " = " + getDefaultInitializer(this))
+        }
+        else {
+            return declaration + " = " + initializer.toKotlin()
         }
-
-        return declaration + " = " + initializer.toKotlin()
     }
 }
diff --git a/j2k/src/org/jetbrains/jet/j2k/ast/LocalVariable.kt b/j2k/src/org/jetbrains/jet/j2k/ast/LocalVariable.kt
index 616c67d5009..fd4fe7e84e9 100644
--- a/j2k/src/org/jetbrains/jet/j2k/ast/LocalVariable.kt
+++ b/j2k/src/org/jetbrains/jet/j2k/ast/LocalVariable.kt
@@ -16,25 +16,23 @@
 
 package org.jetbrains.jet.j2k.ast
 
-import org.jetbrains.jet.j2k.Converter
+import org.jetbrains.jet.j2k.ConverterSettings
 
 class LocalVariable(
         val identifier: Identifier,
         val modifiersSet: Set<Modifier>,
         val javaType: Type,
         val initializer: Expression,
-        val converter: Converter
+        val isVal: Boolean,
+        val settings: ConverterSettings
 ) : Expression() {
 
-    val isImmutable: Boolean
-        get() = converter.settings.forceLocalVariableImmutability || modifiersSet.contains(Modifier.FINAL)
-
     override fun toKotlin(): String {
         if (initializer.isEmpty) {
             return "${identifier.toKotlin()} : ${javaType.toKotlin()}"
         }
 
-        val shouldSpecifyType = converter.settings.specifyLocalVariableTypeByDefault
+        val shouldSpecifyType = settings.specifyLocalVariableTypeByDefault
         return "${identifier.toKotlin()} ${if (shouldSpecifyType) ": ${javaType.toKotlin()} " else ""}= ${initializer.toKotlin()}"
     }
 }
diff --git a/j2k/src/org/jetbrains/jet/j2k/ast/Modifier.kt b/j2k/src/org/jetbrains/jet/j2k/ast/Modifier.kt
index cdcd3f7421d..08883ac09fc 100644
--- a/j2k/src/org/jetbrains/jet/j2k/ast/Modifier.kt
+++ b/j2k/src/org/jetbrains/jet/j2k/ast/Modifier.kt
@@ -22,7 +22,6 @@ enum class Modifier(val name: String) {
     PRIVATE: Modifier("private")
     STATIC: Modifier("static")
     ABSTRACT: Modifier("abstract")
-    FINAL: Modifier("final")
     OPEN: Modifier("open")
     OVERRIDE: Modifier("override")
 
diff --git a/j2k/src/org/jetbrains/jet/j2k/ast/Statements.kt b/j2k/src/org/jetbrains/jet/j2k/ast/Statements.kt
index 7486d969bc6..9aaf66c0b5f 100644
--- a/j2k/src/org/jetbrains/jet/j2k/ast/Statements.kt
+++ b/j2k/src/org/jetbrains/jet/j2k/ast/Statements.kt
@@ -31,7 +31,7 @@ open class DeclarationStatement(val elements: List<Element>) : Statement() {
             = elements.filterIsInstance(javaClass<LocalVariable>()).map { convertDeclaration(it) }.makeString("\n")
 
     private fun convertDeclaration(v: LocalVariable): String
-            = (if (v.isImmutable) "val" else "var") + " " + v.toKotlin()
+            = (if (v.isVal) "val" else "var") + " " + v.toKotlin()
 }
 
 open class ExpressionListStatement(val expressions: List<Expression>) : Expression() {
diff --git a/j2k/src/org/jetbrains/jet/j2k/visitors/ElementVisitor.kt b/j2k/src/org/jetbrains/jet/j2k/visitors/ElementVisitor.kt
index 58086cff70a..06c4a33b64f 100644
--- a/j2k/src/org/jetbrains/jet/j2k/visitors/ElementVisitor.kt
+++ b/j2k/src/org/jetbrains/jet/j2k/visitors/ElementVisitor.kt
@@ -26,14 +26,16 @@ class ElementVisitor(public val converter: Converter) : JavaElementVisitor() {
 
     override fun visitLocalVariable(variable: PsiLocalVariable) {
         var kType = converter.convertVariableType(variable)
-        if (variable.hasModifierProperty(PsiModifier.FINAL) && variable.getInitializer().isDefinitelyNotNull()) {
+        val isFinal = variable.hasModifierProperty(PsiModifier.FINAL)
+        if (isFinal && variable.getInitializer().isDefinitelyNotNull()) {
             kType = kType.toNotNullType()
         }
         result = LocalVariable(Identifier(variable.getName()!!),
-                                 converter.convertModifierList(variable.getModifierList()),
+                                 converter.convertModifiers(variable),
                                  kType,
                                  converter.convertExpression(variable.getInitializer(), variable.getType()),
-                                 converter)
+                                 converter.settings.forceLocalVariableImmutability || isFinal,
+                                 converter.settings)
     }
 
     override fun visitExpressionList(list: PsiExpressionList) {