diff --git a/pom.xml b/pom.xml
index 4b04023..3e090b0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -83,16 +83,18 @@
             <artifactId>kumuluzee-common</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>com.kumuluz.ee</groupId>
-            <artifactId>kumuluzee-cdi-weld</artifactId>
-            <scope>provided</scope>
-        </dependency>
+
         <dependency>
             <groupId>org.eclipse.microprofile.config</groupId>
             <artifactId>microprofile-config-api</artifactId>
             <version>${microprofile-config.version}</version>
         </dependency>
+
+        <dependency>
+            <groupId>com.kumuluz.ee</groupId>
+            <artifactId>kumuluzee-cdi-weld</artifactId>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/src/main/java/com/kumuluz/ee/config/microprofile/ConfigImpl.java b/src/main/java/com/kumuluz/ee/config/microprofile/ConfigImpl.java
index 655af37..c300d03 100644
--- a/src/main/java/com/kumuluz/ee/config/microprofile/ConfigImpl.java
+++ b/src/main/java/com/kumuluz/ee/config/microprofile/ConfigImpl.java
@@ -143,6 +143,7 @@ public <T> T convert(String value, Class<T> asType) {
     }
 
     private Converter getConverter(Class asType) {
+
         if (asType.equals(boolean.class)) {
             asType = Boolean.class;
         } else if (asType.equals(double.class)) {
@@ -156,9 +157,11 @@ private Converter getConverter(Class asType) {
         }
 
         Converter converter = converters.get(asType);
+
         if (converter == null) {
             throw new IllegalArgumentException("No Converter registered for class " + asType);
         }
+
         return converter;
     }
 
diff --git a/src/main/java/com/kumuluz/ee/config/microprofile/cdi/ConfigPropertyProducer.java b/src/main/java/com/kumuluz/ee/config/microprofile/cdi/ConfigPropertyProducer.java
index ce59556..6678c30 100644
--- a/src/main/java/com/kumuluz/ee/config/microprofile/cdi/ConfigPropertyProducer.java
+++ b/src/main/java/com/kumuluz/ee/config/microprofile/cdi/ConfigPropertyProducer.java
@@ -41,7 +41,7 @@ public class ConfigPropertyProducer {
 
     @Dependent
     @ConfigProperty
-    public static final Object getGenericProperty(InjectionPoint ip) {
+    public static Object getGenericProperty(InjectionPoint ip) {
 
         ConfigProperty configPropertyAnnotation = ip.getAnnotated().getAnnotation(ConfigProperty.class);
         String configurationPropertyKey = configPropertyAnnotation.name();