diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyClassDescriptor.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyClassDescriptor.java
index 3ea27e13de1..7300907d8d3 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyClassDescriptor.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyClassDescriptor.java
@@ -37,22 +37,23 @@ import java.util.*;
 public class LazyClassDescriptor extends ClassDescriptorBase implements ClassDescriptor {
 
     private final ResolveSession resolveSession;
+    private final ClassMemberDeclarationProvider declarationProvider;
 
     private final Name name;
     private final DeclarationDescriptor containingDeclaration;
     private final TypeConstructor typeConstructor;
-    private final ClassMemberDeclarationProvider declarationProvider;
-
-    private final LazyClassMemberScope unsubstitutedMemberScope;
-    private final JetScope unsubstitutedInnerClassesScope;
-    private ClassReceiver implicitReceiver;
-    private JetScope scopeForClassHeaderResolution;
-    private JetScope scopeForMemberDeclarationResolution;
-
     private final Modality modality;
     private final Visibility visibility;
     private final ClassKind kind;
 
+    private ClassReceiver implicitReceiver;
+
+    private final LazyClassMemberScope unsubstitutedMemberScope;
+    private final JetScope unsubstitutedInnerClassesScope;
+
+    private JetScope scopeForClassHeaderResolution;
+    private JetScope scopeForMemberDeclarationResolution;
+
 
     public LazyClassDescriptor(
             @NotNull ResolveSession resolveSession,
@@ -103,17 +104,6 @@ public class LazyClassDescriptor extends ClassDescriptorBase implements ClassDes
         return unsubstitutedInnerClassesScope;
     }
 
-    public JetScope getScopeForMemberDeclarationResolution() {
-        if (scopeForMemberDeclarationResolution == null) {
-            WritableScopeImpl scope = new WritableScopeImpl(getScopeForClassHeaderResolution(), this, RedeclarationHandler.DO_NOTHING)
-                    .setDebugName("Member Declaration Resolution");
-
-            scope.changeLockLevel(WritableScope.LockLevel.READING);
-            scopeForMemberDeclarationResolution = scope;
-        }
-        return scopeForMemberDeclarationResolution;
-    }
-
     @NotNull
     public JetScope getScopeForClassHeaderResolution() {
         if (scopeForClassHeaderResolution == null) {
@@ -128,6 +118,19 @@ public class LazyClassDescriptor extends ClassDescriptorBase implements ClassDes
         return scopeForClassHeaderResolution;
     }
 
+    public JetScope getScopeForMemberDeclarationResolution() {
+        if (scopeForMemberDeclarationResolution == null) {
+            WritableScopeImpl scope = new WritableScopeImpl(getScopeForClassHeaderResolution(), this, RedeclarationHandler.DO_NOTHING)
+                    .setDebugName("Member Declaration Resolution");
+
+            // TODO : supertypes etc
+
+            scope.changeLockLevel(WritableScope.LockLevel.READING);
+            scopeForMemberDeclarationResolution = scope;
+        }
+        return scopeForMemberDeclarationResolution;
+    }
+
     @NotNull
     @Override
     public Set<ConstructorDescriptor> getConstructors() {