diff --git a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightClassForPackage.java b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightClassForPackage.java
index 4bdabe4036f..e9e7ea10530 100644
--- a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightClassForPackage.java
+++ b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightClassForPackage.java
@@ -44,7 +44,7 @@ public class KotlinLightClassForPackage extends KotlinLightClassForPackageBase i
     private final FqName fqName;
     private final Collection<JetFile> files;
     private final int hashCode;
-    private CachedValue<PsiClass> delegate;
+    private final CachedValue<PsiClass> delegate;
 
     public KotlinLightClassForPackage(@NotNull PsiManager manager, @NotNull FqName fqName, @NotNull Collection<JetFile> files) {
         super(manager);
diff --git a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightClassForPackageProvider.java b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightClassForPackageProvider.java
index 3ee21a6eef7..542d5e6480a 100644
--- a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightClassForPackageProvider.java
+++ b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightClassForPackageProvider.java
@@ -53,18 +53,16 @@ public class KotlinLightClassForPackageProvider implements CachedValueProvider<P
         this.project = project;
     }
 
-
-
     @Nullable
     @Override
     public Result<PsiClass> compute() {
         checkForBuiltIns();
 
-        final PsiJavaFileStubImpl javaFileStub = new PsiJavaFileStubImpl(fqName.getFqName(), true);
+        PsiJavaFileStubImpl javaFileStub = new PsiJavaFileStubImpl(fqName.getFqName(), true);
 
-        final Stack<StubElement> stubStack = new Stack<StubElement>();
+        Stack<StubElement> stubStack = new Stack<StubElement>();
 
-        final ClassBuilderFactory builderFactory = new KotlinLightClassBuilderFactory(stubStack);
+        ClassBuilderFactory builderFactory = new KotlinLightClassBuilderFactory(stubStack);
 
         // The context must reflect _all files in the module_. not only the current file
         // Otherwise, the analyzer gets confused and can't, for example, tell which files come as sources and which
diff --git a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/LightClassGenerationStrategy.java b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/LightClassGenerationStrategy.java
index 0779ad35b5f..7a093ce23d8 100644
--- a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/LightClassGenerationStrategy.java
+++ b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/LightClassGenerationStrategy.java
@@ -43,7 +43,11 @@ class LightClassGenerationStrategy implements GenerationStrategy {
     private final PsiJavaFileStubImpl answer;
     private final VirtualFile virtualFile;
 
-    public LightClassGenerationStrategy(@NotNull VirtualFile virtualFile, Stack<StubElement> stubStack, PsiJavaFileStubImpl answer) {
+    public LightClassGenerationStrategy(
+            @NotNull VirtualFile virtualFile,
+            @NotNull Stack<StubElement> stubStack,
+            @NotNull PsiJavaFileStubImpl answer
+    ) {
         this.virtualFile = virtualFile;
         this.stubStack = stubStack;
         this.answer = answer;