diff --git a/platform/lang-api/src/com/intellij/psi/codeStyle/LegacyCodeStyleSettingsManager.java b/platform/lang-api/src/com/intellij/psi/codeStyle/LegacyCodeStyleSettingsManager.java
index c6d4c738c1fd..fdc9a662df1d 100644
--- a/platform/lang-api/src/com/intellij/psi/codeStyle/LegacyCodeStyleSettingsManager.java
+++ b/platform/lang-api/src/com/intellij/psi/codeStyle/LegacyCodeStyleSettingsManager.java
@@ -31,7 +31,6 @@ import org.jdom.Element;
   }
 )
 public class LegacyCodeStyleSettingsManager implements PersistentStateComponent<Element> {
-  
   private Element myState;
   
   @Override
diff --git a/platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/CodeStyleManagerImpl.java b/platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/CodeStyleManagerImpl.java
index d51ef1216a59..a9fbe1b4b988 100644
--- a/platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/CodeStyleManagerImpl.java
+++ b/platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/CodeStyleManagerImpl.java
@@ -58,8 +58,7 @@ import java.util.List;
 import java.util.concurrent.TimeUnit;
 
 public class CodeStyleManagerImpl extends CodeStyleManager {
-
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.codeStyle.CodeStyleManagerImpl");
+  private static final Logger LOG = Logger.getInstance(CodeStyleManagerImpl.class);
   private static final ThreadLocal<ProcessingUnderProgressInfo> SEQUENTIAL_PROCESSING_ALLOWED
     = new ThreadLocal<ProcessingUnderProgressInfo>()
   {
diff --git a/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/ComponentStoreImpl.java b/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/ComponentStoreImpl.java
index 0ffb38e83dab..d999a624ab6f 100644
--- a/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/ComponentStoreImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/ComponentStoreImpl.java
@@ -41,8 +41,7 @@ import java.util.*;
 
 @SuppressWarnings({"deprecation"})
 public abstract class ComponentStoreImpl implements IComponentStore {
-
-  private static final Logger LOG = Logger.getInstance("#com.intellij.components.ComponentStoreImpl");
+  private static final Logger LOG = Logger.getInstance(ComponentStoreImpl.class);
   private final Map<String, Object> myComponents = Collections.synchronizedMap(new THashMap<String, Object>());
   private final List<SettingsSavingComponent> mySettingsSavingComponents = Collections.synchronizedList(new ArrayList<SettingsSavingComponent>());
   @Nullable private SaveSessionImpl mySession;
@@ -274,13 +273,12 @@ public abstract class ComponentStoreImpl implements IComponentStore {
   @NotNull
   private static <T> Class<T> getComponentStateClass(@NotNull final PersistentStateComponent<T> persistentStateComponent) {
     final Class persistentStateComponentClass = PersistentStateComponent.class;
+
     Class componentClass = persistentStateComponent.getClass();
 
     nextSuperClass:
     while (true) {
-      final Class[] interfaces = componentClass.getInterfaces();
-
-      for (Class anInterface : interfaces) {
+      for (Class anInterface : componentClass.getInterfaces()) {
         if (anInterface.equals(persistentStateComponentClass)) {
           break nextSuperClass;
         }
@@ -290,7 +288,7 @@ public abstract class ComponentStoreImpl implements IComponentStore {
     }
 
     final Type type = ReflectionUtil.resolveVariable(persistentStateComponentClass.getTypeParameters()[0], componentClass);
-
+    assert type != null;
     //noinspection unchecked
     return (Class<T>)ReflectionUtil.getRawType(type);
   }