diff --git a/framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/model/impl/DefaultModuleDefinitionSet.java b/framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/model/impl/DefaultModuleDefinitionSet.java
index 768c153b996..d108a2acefa 100644
--- a/framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/model/impl/DefaultModuleDefinitionSet.java
+++ b/framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/model/impl/DefaultModuleDefinitionSet.java
@@ -18,20 +18,6 @@
  */
 package org.apache.cloudstack.spring.module.model.impl;
 
-import org.apache.cloudstack.spring.module.context.ResourceApplicationContext;
-import org.apache.cloudstack.spring.module.model.ModuleDefinition;
-import org.apache.cloudstack.spring.module.model.ModuleDefinitionSet;
-import org.apache.commons.io.IOUtils;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.springframework.beans.BeansException;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.core.io.Resource;
-import org.springframework.core.io.UrlResource;
-import org.springframework.util.StringUtils;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
@@ -46,6 +32,22 @@ import java.util.Properties;
 import java.util.Set;
 import java.util.Stack;
 
+import org.apache.commons.io.IOUtils;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.io.Resource;
+import org.springframework.core.io.UrlResource;
+import org.springframework.util.StringUtils;
+
+import org.apache.cloudstack.spring.module.context.ResourceApplicationContext;
+import org.apache.cloudstack.spring.module.model.ModuleDefinition;
+import org.apache.cloudstack.spring.module.model.ModuleDefinitionSet;
+
+
 public class DefaultModuleDefinitionSet implements ModuleDefinitionSet {
 
     protected Logger logger = LogManager.getLogger(getClass());
@@ -74,9 +76,8 @@ public class DefaultModuleDefinitionSet implements ModuleDefinitionSet {
     }
 
     public void load() throws IOException {
-        if (!loadRootContext()) {
+        if (!loadRootContext())
             return;
-        }
 
         printHierarchy();
         loadContexts();
@@ -86,9 +87,8 @@ public class DefaultModuleDefinitionSet implements ModuleDefinitionSet {
     protected boolean loadRootContext() {
         ModuleDefinition def = modules.get(root);
 
-        if (def == null) {
+        if (def == null)
             return false;
-        }
 
         ApplicationContext defaultsContext = getDefaultsContext();
 
@@ -194,7 +194,8 @@ public class DefaultModuleDefinitionSet implements ModuleDefinitionSet {
         context.setApplicationName("/defaults");
         context.refresh();
 
-        @SuppressWarnings("unchecked") final List<Resource> resources = (List<Resource>) context.getBean(DEFAULT_CONFIG_RESOURCES);
+        @SuppressWarnings("unchecked")
+        final List<Resource> resources = (List<Resource>) context.getBean(DEFAULT_CONFIG_RESOURCES);
 
         withModule(new WithModule() {
             @Override
@@ -205,12 +206,12 @@ public class DefaultModuleDefinitionSet implements ModuleDefinitionSet {
             }
         });
 
-        configProperties = (Properties) context.getBean(DEFAULT_CONFIG_PROPERTIES);
+        configProperties = (Properties)context.getBean(DEFAULT_CONFIG_PROPERTIES);
         for (Resource resource : resources) {
             load(resource, configProperties);
         }
 
-        for (Resource resource : (Resource[]) context.getBean(MODULE_PROPERITES)) {
+        for (Resource resource : (Resource[])context.getBean(MODULE_PROPERITES)) {
             load(resource, configProperties);
         }
 
@@ -266,9 +267,8 @@ public class DefaultModuleDefinitionSet implements ModuleDefinitionSet {
     }
 
     protected void withModule(ModuleDefinition def, Stack<ModuleDefinition> parents, WithModule with) {
-        if (def == null) {
+        if (def == null)
             return;
-        }
 
         if (!shouldLoad(def)) {
             logger.info("Excluding context [" + def.getName() + "] based on configuration");