diff --git a/multiapps-mta/src/main/java/org/cloudfoundry/multiapps/mta/resolvers/PropertiesResolver.java b/multiapps-mta/src/main/java/org/cloudfoundry/multiapps/mta/resolvers/PropertiesResolver.java
index 437fcf88..90481f45 100644
--- a/multiapps-mta/src/main/java/org/cloudfoundry/multiapps/mta/resolvers/PropertiesResolver.java
+++ b/multiapps-mta/src/main/java/org/cloudfoundry/multiapps/mta/resolvers/PropertiesResolver.java
@@ -104,7 +104,7 @@ private boolean isSimpleReference(String value, List<Reference> references) {
     protected Object resolveReferenceInContext(String key, Reference reference) {
         return resolveReferenceInContext(key, reference, false);
     }
-    
+
     protected Object resolveReferenceInContext(String key, Reference reference, boolean shouldBackupContext) {
         boolean resolutionContextWasCreated = false;
         HashSet<String> contextKeysBackup = null;
@@ -113,7 +113,7 @@ protected Object resolveReferenceInContext(String key, Reference reference, bool
             resolutionContextWasCreated = true;
         } else if (shouldBackupContext) {
             // if multiple refs are resolved sequentially in a value - backup and revert context after each ref
-            contextKeysBackup = new HashSet<String>(resolutionContext.referencedKeys);
+            contextKeysBackup = new HashSet<>(resolutionContext.referencedKeys);
         }
         Object resolvedValue = resolveReference(reference);
         if (resolutionContextWasCreated) {
@@ -181,8 +181,7 @@ protected Object resolveReferenceInDepth(Reference reference, Map<String, Object
                 currentProperty = resolveKeyInIterable(keyPart, (Collection<?>) currentProperty, deepReferenceKey);
                 keyPart = "";
             } else if (currentProperty instanceof Map) {
-                @SuppressWarnings("unchecked")
-                Object subProperty = MapUtils.getObject((Map<Object, ?>) currentProperty, keyPart);
+                @SuppressWarnings("unchecked") Object subProperty = MapUtils.getObject((Map<Object, ?>) currentProperty, keyPart);
                 if (subProperty != null) {
                     currentProperty = subProperty;
                     keyPart = "";
@@ -243,8 +242,8 @@ public void addToReferencedKeys(String key) {
             }
             referencedKeys.add(key);
         }
-        
-        public void setReferencedKeys(HashSet<String> keys) {
+
+        public void setReferencedKeys(Set<String> keys) {
             this.referencedKeys = keys;
         }