diff --git a/dxa-framework/dxa-common-api/src/main/java/com/sdl/webapp/common/api/contextengine/ContextClaims.java b/dxa-framework/dxa-common-api/src/main/java/com/sdl/webapp/common/api/contextengine/ContextClaims.java
index ed6382e95..b71594507 100644
--- a/dxa-framework/dxa-common-api/src/main/java/com/sdl/webapp/common/api/contextengine/ContextClaims.java
+++ b/dxa-framework/dxa-common-api/src/main/java/com/sdl/webapp/common/api/contextengine/ContextClaims.java
@@ -84,7 +84,7 @@ public <T> ArrayList<T> getClaimValues(String propertyName, Class<T> cls) {
                 return null;
             } else {
                 if (Set.class.isInstance(claimValue)) {
-                    Set retval = ((Set) claimValue);
+                    Set retval = (Set) claimValue;
                     ArrayList<T> array = new ArrayList<>();
                     for (Object o : retval) {
                         array.add(castValue(o, cls));
diff --git a/dxa-framework/dxa-common-api/src/main/java/com/sdl/webapp/common/api/formatters/FeedFormatter.java b/dxa-framework/dxa-common-api/src/main/java/com/sdl/webapp/common/api/formatters/FeedFormatter.java
index c40afe14f..a892eeb48 100644
--- a/dxa-framework/dxa-common-api/src/main/java/com/sdl/webapp/common/api/formatters/FeedFormatter.java
+++ b/dxa-framework/dxa-common-api/src/main/java/com/sdl/webapp/common/api/formatters/FeedFormatter.java
@@ -47,7 +47,7 @@ public FeedFormatter(HttpServletRequest request, WebRequestContext context) {
      * @return whether a field is a list
      */
     private static boolean isList(SemanticEntity annotation) {
-        return (annotation.vocabulary().equals(SemanticVocabulary.SCHEMA_ORG) && annotation.entityName().equals("ItemList"));
+        return annotation.vocabulary().equals(SemanticVocabulary.SCHEMA_ORG) && annotation.entityName().equals("ItemList");
 
     }
 
diff --git a/dxa-framework/dxa-common-api/src/main/java/com/sdl/webapp/common/api/model/entity/Image.java b/dxa-framework/dxa-common-api/src/main/java/com/sdl/webapp/common/api/model/entity/Image.java
index ea4b1e839..c9460eb29 100644
--- a/dxa-framework/dxa-common-api/src/main/java/com/sdl/webapp/common/api/model/entity/Image.java
+++ b/dxa-framework/dxa-common-api/src/main/java/com/sdl/webapp/common/api/model/entity/Image.java
@@ -67,7 +67,7 @@ public HtmlElement toHtmlElement(String widthFactor, double aspect, String cssCl
         return img(getMediaHelper().getResponsiveImageUrl(getUrl(), widthFactor, aspect, containerSize))
                 .withAlt(this.alternateText)
                 .withClass(cssClass)
-                .withAttribute("data-aspect", String.valueOf((Math.round(aspect * 100) / 100)))
+                .withAttribute("data-aspect", String.valueOf(Math.round(aspect * 100) / 100))
                 .withAttribute("width", widthFactor)
                 .build();
     }
diff --git a/dxa-framework/dxa-common-impl/src/main/java/com/sdl/webapp/common/impl/mapping/SemanticMappingRegistryImpl.java b/dxa-framework/dxa-common-impl/src/main/java/com/sdl/webapp/common/impl/mapping/SemanticMappingRegistryImpl.java
index e137a65c0..9b5b6d639 100644
--- a/dxa-framework/dxa-common-impl/src/main/java/com/sdl/webapp/common/impl/mapping/SemanticMappingRegistryImpl.java
+++ b/dxa-framework/dxa-common-impl/src/main/java/com/sdl/webapp/common/impl/mapping/SemanticMappingRegistryImpl.java
@@ -288,7 +288,7 @@ public Class<? extends EntityModel> getEntityClassByFullyQualifiedName(String en
                 }
             }
         }
-        if (possibleValues.size() > 0) {
+        if (!possibleValues.isEmpty()) {
             for (Class<? extends EntityModel> cls : possibleValues) {
                 if (cls.getSimpleName().equals(entityNameSplit[entityNameSplit.length - 1])) {
                     return cls;
diff --git a/dxa-framework/dxa-common-impl/src/main/java/com/sdl/webapp/common/impl/taglib/dxa/RichTextTag.java b/dxa-framework/dxa-common-impl/src/main/java/com/sdl/webapp/common/impl/taglib/dxa/RichTextTag.java
index ca83b8a56..69cfc6c41 100644
--- a/dxa-framework/dxa-common-impl/src/main/java/com/sdl/webapp/common/impl/taglib/dxa/RichTextTag.java
+++ b/dxa-framework/dxa-common-impl/src/main/java/com/sdl/webapp/common/impl/taglib/dxa/RichTextTag.java
@@ -41,7 +41,7 @@ public int doStartTag() throws JspException {
         StringBuilder builder = new StringBuilder(2048);
         try {
             for (RichTextFragment fragment : content.getFragments()) {
-                EntityModel entityModel = (fragment instanceof EntityModel ? (EntityModel) fragment : null);
+                EntityModel entityModel = fragment instanceof EntityModel ? (EntityModel) fragment : null;
                 String htmlFragment;
                 if (entityModel == null) {
                     htmlFragment = fragment.toHtmlElement().toHtml();