diff --git a/apollo-client/src/main/java/com/ctrip/framework/apollo/spi/DefaultConfigFactory.java b/apollo-client/src/main/java/com/ctrip/framework/apollo/spi/DefaultConfigFactory.java
index e202fba8..6f896892 100644
--- a/apollo-client/src/main/java/com/ctrip/framework/apollo/spi/DefaultConfigFactory.java
+++ b/apollo-client/src/main/java/com/ctrip/framework/apollo/spi/DefaultConfigFactory.java
@@ -72,7 +72,7 @@ public Config create(String namespace) {
   public Config create(String appId, String namespace) {
     ConfigFileFormat format = determineFileFormat(namespace);
 
-    ConfigRepository configRepository = null;
+    ConfigRepository configRepository;
 
     // although ConfigFileFormat.Properties are compatible with themselves we
     // should not create a PropertiesCompatibleFileConfigRepository for them
diff --git a/apollo-client/src/main/java/com/ctrip/framework/apollo/spi/DefaultConfigRegistry.java b/apollo-client/src/main/java/com/ctrip/framework/apollo/spi/DefaultConfigRegistry.java
index f77d1e49..6c42fd59 100644
--- a/apollo-client/src/main/java/com/ctrip/framework/apollo/spi/DefaultConfigRegistry.java
+++ b/apollo-client/src/main/java/com/ctrip/framework/apollo/spi/DefaultConfigRegistry.java
@@ -60,7 +60,6 @@ public ConfigFactory getFactory(String namespace) {
 
   @Override
   public ConfigFactory getFactory(String appId, String namespace) {
-    ConfigFactory config = m_instances.get(appId, namespace);
-    return config;
+    return m_instances.get(appId, namespace);
   }
 }
diff --git a/apollo-client/src/main/java/com/ctrip/framework/apollo/spring/property/SpringValueDefinitionProcessor.java b/apollo-client/src/main/java/com/ctrip/framework/apollo/spring/property/SpringValueDefinitionProcessor.java
index a24e5205..f98a614e 100644
--- a/apollo-client/src/main/java/com/ctrip/framework/apollo/spring/property/SpringValueDefinitionProcessor.java
+++ b/apollo-client/src/main/java/com/ctrip/framework/apollo/spring/property/SpringValueDefinitionProcessor.java
@@ -73,10 +73,7 @@ public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory)
   }
 
   public static Multimap<String, SpringValueDefinition> getBeanName2SpringValueDefinitions(BeanDefinitionRegistry registry) {
-    Multimap<String, SpringValueDefinition> springValueDefinitions = beanName2SpringValueDefinitions.computeIfAbsent(
-        registry, k -> LinkedListMultimap.create());
-
-    return springValueDefinitions;
+    return beanName2SpringValueDefinitions.computeIfAbsent(registry, k -> LinkedListMultimap.create());
   }
 
   private void processPropertyValues(BeanDefinitionRegistry beanRegistry) {
diff --git a/apollo-core/src/main/java/com/ctrip/framework/foundation/internals/NetworkInterfaceManager.java b/apollo-core/src/main/java/com/ctrip/framework/foundation/internals/NetworkInterfaceManager.java
index b93610b5..d1f4fdfb 100644
--- a/apollo-core/src/main/java/com/ctrip/framework/foundation/internals/NetworkInterfaceManager.java
+++ b/apollo-core/src/main/java/com/ctrip/framework/foundation/internals/NetworkInterfaceManager.java
@@ -93,9 +93,7 @@ public String getLocalHostName() {
   }
 
   private String getProperty(String name) {
-    String value = null;
-
-    value = System.getProperty(name);
+    String value = System.getProperty(name);
 
     if (value == null) {
       value = System.getenv(name);