More cleanup
diff --git a/openaz-xacml-pdp-rest/src/main/java/com/att/research/xacml/rest/XACMLPdpServlet.java b/openaz-xacml-pdp-rest/src/main/java/com/att/research/xacml/rest/XACMLPdpServlet.java
index 824adb6..c6d7cce 100644
--- a/openaz-xacml-pdp-rest/src/main/java/com/att/research/xacml/rest/XACMLPdpServlet.java
+++ b/openaz-xacml-pdp-rest/src/main/java/com/att/research/xacml/rest/XACMLPdpServlet.java
@@ -513,7 +513,7 @@
                 if (contentType.getMimeType().equalsIgnoreCase(ContentType.APPLICATION_JSON.getMimeType())) {
                     pdpRequest = JSONRequest.load(incomingRequestString);
                 } else if (     contentType.getMimeType().equalsIgnoreCase(ContentType.APPLICATION_XML.getMimeType()) ||
-                            contentType.getMimeType().equalsIgnoreCase("application/xacml+xml")) {
+                                contentType.getMimeType().equalsIgnoreCase("application/xacml+xml")) {
                     pdpRequest = DOMRequest.load(incomingRequestString);
                 }
             } catch(Exception e) {
diff --git a/openaz-xacml/src/main/java/com/att/research/xacml/api/pap/PDPPolicy.java b/openaz-xacml/src/main/java/com/att/research/xacml/api/pap/PDPPolicy.java
index 5d37d96..17592d6 100644
--- a/openaz-xacml/src/main/java/com/att/research/xacml/api/pap/PDPPolicy.java
+++ b/openaz-xacml/src/main/java/com/att/research/xacml/api/pap/PDPPolicy.java
@@ -39,35 +39,32 @@
 import com.fasterxml.jackson.annotation.JsonSubTypes.Type;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 
-
 /*
  * The following allows us to use Jackson to convert sub-types of this type into JSON and back to objects.
  */
-@JsonTypeInfo(
-    use = JsonTypeInfo.Id.NAME,
-    include = JsonTypeInfo.As.PROPERTY,
-    property = "PDPPolicyType")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "PDPPolicyType")
 @JsonSubTypes({
     @Type(value = StdPDPPolicy.class, name = "StdPDPPolicy")
 })
 public interface PDPPolicy {
 
-    public String               getId();
+    public String getId();
 
-    public String               getName();
+    public String getName();
 
-    public String               getPolicyId();
+    public String getPolicyId();
 
-    public String               getDescription();
+    public String getDescription();
 
-    public String               getVersion();
-    public int[]                getVersionInts();
+    public String getVersion();
 
-    public boolean              isRoot();
+    public int[] getVersionInts();
 
-    public boolean              isValid();
+    public boolean isRoot();
 
-    public InputStream  getStream() throws PAPException, IOException;
+    public boolean isValid();
 
-    public URI                  getLocation() throws PAPException, IOException;
+    public InputStream getStream() throws PAPException, IOException;
+
+    public URI getLocation() throws PAPException, IOException;
 }
diff --git a/openaz-xacml/src/main/java/com/att/research/xacml/api/pap/PDPStatus.java b/openaz-xacml/src/main/java/com/att/research/xacml/api/pap/PDPStatus.java
index f696ef7..be20aac 100644
--- a/openaz-xacml/src/main/java/com/att/research/xacml/api/pap/PDPStatus.java
+++ b/openaz-xacml/src/main/java/com/att/research/xacml/api/pap/PDPStatus.java
@@ -37,14 +37,10 @@
 import com.fasterxml.jackson.annotation.JsonSubTypes.Type;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 
-
 /*
  * The following allows us to use Jackson to convert sub-types of this type into JSON and back to objects.
  */
-@JsonTypeInfo(
-              use = JsonTypeInfo.Id.NAME,
-              include = JsonTypeInfo.As.PROPERTY,
-              property = "PDPStatusType")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "PDPStatusType")
 @JsonSubTypes({
     @Type(value = StdPDPStatus.class, name = "StdPDPStatus")
 })
@@ -61,26 +57,26 @@
         CANNOT_CONNECT
     }
 
-    public Status                               getStatus();
+    public Status getStatus();
 
-    public Set<String>                  getLoadErrors();
+    public Set<String> getLoadErrors();
 
-    public Set<String>                  getLoadWarnings();
+    public Set<String> getLoadWarnings();
 
-    public Set<PDPPolicy>               getLoadedPolicies();
+    public Set<PDPPolicy> getLoadedPolicies();
 
-    public Set<PDPPolicy>               getLoadedRootPolicies();
+    public Set<PDPPolicy> getLoadedRootPolicies();
 
-    public Set<PDPPolicy>               getFailedPolicies();
+    public Set<PDPPolicy> getFailedPolicies();
 
-    public boolean                              policiesOK();
+    public boolean policiesOK();
 
-    public Set<PDPPIPConfig>    getLoadedPipConfigs();
+    public Set<PDPPIPConfig> getLoadedPipConfigs();
 
-    public Set<PDPPIPConfig>    getFailedPipConfigs();
+    public Set<PDPPIPConfig> getFailedPipConfigs();
 
-    public boolean                              pipConfigOK();
+    public boolean pipConfigOK();
 
-    public boolean                              isOk();
+    public boolean isOk();
 
 }
diff --git a/openaz-xacml/src/main/java/com/att/research/xacml/std/datatypes/XPathDayTimeDuration.java b/openaz-xacml/src/main/java/com/att/research/xacml/std/datatypes/XPathDayTimeDuration.java
index 3d49d40..4371db1 100644
--- a/openaz-xacml/src/main/java/com/att/research/xacml/std/datatypes/XPathDayTimeDuration.java
+++ b/openaz-xacml/src/main/java/com/att/research/xacml/std/datatypes/XPathDayTimeDuration.java
@@ -52,11 +52,11 @@
     public XPathDayTimeDuration(int durationSignIn, int daysIn, int hoursIn, int minutesIn, double secondsIn) {
         super(durationSignIn, 0, 0, daysIn, hoursIn, minutesIn, secondsIn);
         fractionalSeconds       = this.getDurationSign() * (
-                                  this.getDays() * 24 * 60 * 60 +
-                                  this.getHours() * 60 * 60 +
-                                  this.getMinutes() * 60 +
-                                  this.getFractionalSecs()
-                              );
+                                      this.getDays() * 24 * 60 * 60 +
+                                      this.getHours() * 60 * 60 +
+                                      this.getMinutes() * 60 +
+                                      this.getFractionalSecs()
+                                  );
     }
 
     public double getFractionalSeconds() {