diff --git a/jps/model-impl/src/org/jetbrains/jps/model/impl/JpsEventDispatcherBase.java b/jps/model-impl/src/org/jetbrains/jps/model/impl/JpsEventDispatcherBase.java
index 7226b3854069..e36362b50dd8 100644
--- a/jps/model-impl/src/org/jetbrains/jps/model/impl/JpsEventDispatcherBase.java
+++ b/jps/model-impl/src/org/jetbrains/jps/model/impl/JpsEventDispatcherBase.java
@@ -29,7 +29,7 @@ import java.util.Map;
  * @author nik
  */
 public abstract class JpsEventDispatcherBase implements JpsEventDispatcher {
-  private Map<Class<?>, EventDispatcher<?>> myDispatchers = new HashMap<Class<?>, EventDispatcher<?>>();
+  private final Map<Class<?>, EventDispatcher<?>> myDispatchers = new HashMap<Class<?>, EventDispatcher<?>>();
 
   @NotNull
   @Override
diff --git a/jps/model-impl/src/org/jetbrains/jps/model/java/impl/compiler/JpsCompilerExcludesImpl.java b/jps/model-impl/src/org/jetbrains/jps/model/java/impl/compiler/JpsCompilerExcludesImpl.java
index 315347621526..bd3a59974979 100644
--- a/jps/model-impl/src/org/jetbrains/jps/model/java/impl/compiler/JpsCompilerExcludesImpl.java
+++ b/jps/model-impl/src/org/jetbrains/jps/model/java/impl/compiler/JpsCompilerExcludesImpl.java
@@ -41,11 +41,11 @@ public class JpsCompilerExcludesImpl implements JpsCompilerExcludes {
     addExcludedDirectory(JpsPathUtil.urlToFile(url), recursively);
   }
 
-  public void addExcludedFile(File file) {
+  protected void addExcludedFile(File file) {
     myFiles.add(file);
   }
 
-  public void addExcludedDirectory(File dir, boolean recursively) {
+  protected void addExcludedDirectory(File dir, boolean recursively) {
     (recursively ? myRecursivelyExcludedDirectories : myDirectories).add(dir);
   }
 
diff --git a/jps/model-impl/src/org/jetbrains/jps/model/java/impl/compiler/JpsJavaCompilerConfigurationImpl.java b/jps/model-impl/src/org/jetbrains/jps/model/java/impl/compiler/JpsJavaCompilerConfigurationImpl.java
index dfebfa2ce83c..dbf5eac3529f 100644
--- a/jps/model-impl/src/org/jetbrains/jps/model/java/impl/compiler/JpsJavaCompilerConfigurationImpl.java
+++ b/jps/model-impl/src/org/jetbrains/jps/model/java/impl/compiler/JpsJavaCompilerConfigurationImpl.java
@@ -36,13 +36,13 @@ public class JpsJavaCompilerConfigurationImpl extends JpsCompositeElementBase<Jp
   public static final JpsElementChildRole<JpsJavaCompilerConfiguration> ROLE = JpsElementChildRoleBase.create("compiler configuration");
   private boolean myAddNotNullAssertions = true;
   private boolean myClearOutputDirectoryOnRebuild = true;
-  private JpsCompilerExcludes myCompilerExcludes = new JpsCompilerExcludesImpl();
-  private List<String> myResourcePatterns = new ArrayList<String>();
-  private List<ProcessorConfigProfile> myAnnotationProcessingProfiles = new ArrayList<ProcessorConfigProfile>();
-  private ProcessorConfigProfileImpl myDefaultAnnotationProcessingProfile = new ProcessorConfigProfileImpl("Default");
+  private final JpsCompilerExcludes myCompilerExcludes = new JpsCompilerExcludesImpl();
+  private final List<String> myResourcePatterns = new ArrayList<String>();
+  private final List<ProcessorConfigProfile> myAnnotationProcessingProfiles = new ArrayList<ProcessorConfigProfile>();
+  private final ProcessorConfigProfileImpl myDefaultAnnotationProcessingProfile = new ProcessorConfigProfileImpl("Default");
   private String myProjectByteCodeTargetLevel;
-  private Map<String, String> myModulesByteCodeTargetLevels = new HashMap<String, String>();
-  private Map<String, JpsJavaCompilerOptions> myCompilerOptions = new HashMap<String, JpsJavaCompilerOptions>();
+  private final Map<String, String> myModulesByteCodeTargetLevels = new HashMap<String, String>();
+  private final Map<String, JpsJavaCompilerOptions> myCompilerOptions = new HashMap<String, JpsJavaCompilerOptions>();
   private String myJavaCompilerId = "Javac";
   private Map<JpsModule, ProcessorConfigProfile> myAnnotationProcessingProfileMap;
   private ResourcePatterns myCompiledPatterns;
diff --git a/jps/model-impl/src/org/jetbrains/jps/model/java/impl/compiler/ResourcePatterns.java b/jps/model-impl/src/org/jetbrains/jps/model/java/impl/compiler/ResourcePatterns.java
index ed62fa4e6561..f1273621f823 100644
--- a/jps/model-impl/src/org/jetbrains/jps/model/java/impl/compiler/ResourcePatterns.java
+++ b/jps/model-impl/src/org/jetbrains/jps/model/java/impl/compiler/ResourcePatterns.java
@@ -160,7 +160,7 @@ public class ResourcePatterns {
     return wildcardPattern;
   }
 
-  public static boolean isPatternNegated(String wildcardPattern) {
+  private static boolean isPatternNegated(String wildcardPattern) {
     return wildcardPattern.length() > 1 && wildcardPattern.charAt(0) == '!';
   }
 
diff --git a/jps/model-impl/src/org/jetbrains/jps/model/library/impl/JpsLibraryRole.java b/jps/model-impl/src/org/jetbrains/jps/model/library/impl/JpsLibraryRole.java
index 1c1492058878..0da1aadbfee1 100644
--- a/jps/model-impl/src/org/jetbrains/jps/model/library/impl/JpsLibraryRole.java
+++ b/jps/model-impl/src/org/jetbrains/jps/model/library/impl/JpsLibraryRole.java
@@ -26,7 +26,7 @@ import org.jetbrains.jps.model.library.JpsLibraryListener;
  * @author nik
  */
 public class JpsLibraryRole extends JpsElementChildRoleBase<JpsLibrary> {
-  public static final JpsLibraryRole INSTANCE = new JpsLibraryRole();
+  private static final JpsLibraryRole INSTANCE = new JpsLibraryRole();
   public static final JpsElementCollectionRole<JpsLibrary> LIBRARIES_COLLECTION_ROLE = JpsElementCollectionRole.create(INSTANCE);
 
   private JpsLibraryRole() {
diff --git a/jps/model-impl/src/org/jetbrains/jps/model/module/impl/JpsModuleImpl.java b/jps/model-impl/src/org/jetbrains/jps/model/module/impl/JpsModuleImpl.java
index 8bf2845b136a..68fa7674ebda 100644
--- a/jps/model-impl/src/org/jetbrains/jps/model/module/impl/JpsModuleImpl.java
+++ b/jps/model-impl/src/org/jetbrains/jps/model/module/impl/JpsModuleImpl.java
@@ -40,7 +40,7 @@ import java.util.List;
 public class JpsModuleImpl<P extends JpsElement> extends JpsNamedCompositeElementBase<JpsModuleImpl<P>> implements JpsTypedModule<P> {
   private static final JpsUrlListRole CONTENT_ROOTS_ROLE = new JpsUrlListRole("content roots");
   private static final JpsUrlListRole EXCLUDED_ROOTS_ROLE = new JpsUrlListRole("excluded roots");
-  public static final JpsElementChildRole<JpsDependenciesListImpl> DEPENDENCIES_LIST_CHILD_ROLE = JpsElementChildRoleBase.create("dependencies");
+  private static final JpsElementChildRole<JpsDependenciesListImpl> DEPENDENCIES_LIST_CHILD_ROLE = JpsElementChildRoleBase.create("dependencies");
   private final JpsModuleType<P> myModuleType;
   private final JpsLibraryCollection myLibraryCollection;