diff --git a/src/HTML_Renderer/org/lobobrowser/html/renderer/BaseElementRenderable.java b/src/HTML_Renderer/org/lobobrowser/html/renderer/BaseElementRenderable.java
index c5f0924d..5ab90d71 100644
--- a/src/HTML_Renderer/org/lobobrowser/html/renderer/BaseElementRenderable.java
+++ b/src/HTML_Renderer/org/lobobrowser/html/renderer/BaseElementRenderable.java
@@ -452,7 +452,7 @@ protected void applyStyle(final int availWidth, final int availHeight) {
       final Integer declaredWidth = this.getDeclaredWidth(rs, actualAvailWidth);
       final Integer declaredHeight = this.getDeclaredHeight(rs, actualAvailHeight);
       // TODO: Get rid of autoMarginX and autoMarginY. They will be always zero
-      int autoMarginX = 0, autoMarginY = 0;
+      final int autoMarginX = 0, autoMarginY = 0;
       this.borderInsets = borderInsets;
       if (isRootBlock) {
         // In the root block, the margin behaves like an extra padding.
@@ -515,7 +515,7 @@ protected Dimension applyAutoStyles(final int availWidth, final int availHeight)
     if (rootElement == null) {
       return null;
     }
-    Dimension changes = new Dimension();
+    final Dimension changes = new Dimension();
     final RenderState rs = rootElement.getRenderState();
     if (rs == null) {
       throw new IllegalStateException("Element without render state: " + rootElement + "; parent=" + rootElement.getParentNode());
@@ -848,19 +848,19 @@ private Insets getInsets(final boolean hscroll, final boolean vscroll,
     int bottom = 0;
     int left = 0;
     int right = 0;
-    if (includeMI && mi != null) {
+    if (includeMI && (mi != null)) {
       top += mi.top;
       left += mi.left;
       bottom += mi.bottom;
       right += mi.right;
     }
-    if (includeBI && bi != null) {
+    if (includeBI && (bi != null)) {
       top += bi.top;
       left += bi.left;
       bottom += bi.bottom;
       right += bi.right;
     }
-    if (includePI && pi != null) {
+    if (includePI && (pi != null)) {
       top += pi.top;
       left += pi.left;
       bottom += pi.bottom;
diff --git a/src/HTML_Renderer/org/lobobrowser/html/renderer/RBlock.java b/src/HTML_Renderer/org/lobobrowser/html/renderer/RBlock.java
index f12fb32b..2c557a67 100644
--- a/src/HTML_Renderer/org/lobobrowser/html/renderer/RBlock.java
+++ b/src/HTML_Renderer/org/lobobrowser/html/renderer/RBlock.java
@@ -325,7 +325,8 @@ public final void doLayout(final int availWidth, final int availHeight, final bo
     this.doLayout(availWidth, availHeight, true, false, null, this.defaultOverflowX, this.defaultOverflowY, sizeOnly);
   }
 
-  public void doLayout(int availWidth, int availHeight, boolean expand, boolean sizeOnly) {
+  @Override
+  public void doLayout(final int availWidth, final int availHeight, final boolean expand, final boolean sizeOnly) {
     this.doLayout(availWidth, availHeight, expand, expand, null, this.defaultOverflowX, this.defaultOverflowY, sizeOnly);
   }
 
diff --git a/src/HTML_Renderer/org/lobobrowser/html/renderer/RBlockViewport.java b/src/HTML_Renderer/org/lobobrowser/html/renderer/RBlockViewport.java
index 68b921be..42855140 100644
--- a/src/HTML_Renderer/org/lobobrowser/html/renderer/RBlockViewport.java
+++ b/src/HTML_Renderer/org/lobobrowser/html/renderer/RBlockViewport.java
@@ -1602,7 +1602,7 @@ private final void layoutFloat(final BoundableRenderable renderable, final boole
         final RElement e = (RElement) renderable;
         e.layout(availWidth, availHeight, this.sizeOnly);
       } else if (renderable instanceof RRelative) {
-        RRelative rRelative = (RRelative) renderable;
+        final RRelative rRelative = (RRelative) renderable;
         rRelative.layout(availWidth, availHeight, this.sizeOnly);
       } else {
         // TODO Check other types of renderabls
@@ -2620,7 +2620,7 @@ private void placeFloat(final BoundableRenderable element, final int y, final bo
         }
         break;
       }
-      if ((desiredWidth <= 0) || boxWidth <= (desiredWidth - rightOffset - leftOffset)) {
+      if ((desiredWidth <= 0) || (boxWidth <= (desiredWidth - rightOffset - leftOffset))) {
         // Size is fine.
         break;
       }
diff --git a/src/HTML_Renderer/org/lobobrowser/html/renderer/RInlineBlock.java b/src/HTML_Renderer/org/lobobrowser/html/renderer/RInlineBlock.java
index f91dd79c..ddf0bcfa 100644
--- a/src/HTML_Renderer/org/lobobrowser/html/renderer/RInlineBlock.java
+++ b/src/HTML_Renderer/org/lobobrowser/html/renderer/RInlineBlock.java
@@ -110,7 +110,7 @@ public Component addComponent(final Component component) {
   }
 
   @Override
-  protected void doLayout(int availWidth, int availHeight, boolean expand, boolean sizeOnly) {
+  protected void doLayout(final int availWidth, final int availHeight, final boolean expand, final boolean sizeOnly) {
     this.child.doLayout(availWidth, availHeight, expand, expand, null, 0, 0, sizeOnly, true);
   }
 }
diff --git a/src/HTML_Renderer/org/lobobrowser/html/renderer/RRelative.java b/src/HTML_Renderer/org/lobobrowser/html/renderer/RRelative.java
index 63d56634..b61f506f 100644
--- a/src/HTML_Renderer/org/lobobrowser/html/renderer/RRelative.java
+++ b/src/HTML_Renderer/org/lobobrowser/html/renderer/RRelative.java
@@ -143,7 +143,7 @@ public void paint(final Graphics g) {
   }
 
 
-  public void layout(int availWidth, int availHeight, boolean sizeOnly) {
+  public void layout(final int availWidth, final int availHeight, final boolean sizeOnly) {
     child.layout(availWidth, availHeight, false, sizeOnly);
     assignDimension();
   }
diff --git a/src/HTML_Renderer/org/lobobrowser/html/renderer/RTable.java b/src/HTML_Renderer/org/lobobrowser/html/renderer/RTable.java
index 5447bf6a..95fccd75 100644
--- a/src/HTML_Renderer/org/lobobrowser/html/renderer/RTable.java
+++ b/src/HTML_Renderer/org/lobobrowser/html/renderer/RTable.java
@@ -420,7 +420,7 @@ public LayoutValue(final int width, final int height) {
   }
 
   @Override
-  protected void doLayout(int availWidth, int availHeight, boolean expand, boolean sizeOnly) {
+  protected void doLayout(final int availWidth, final int availHeight, final boolean expand, final boolean sizeOnly) {
     // TODO: Is it okay to ignore `expand`?
     doLayout(availWidth, availHeight, sizeOnly);
   }
diff --git a/src/HTML_Renderer/org/lobobrowser/html/renderer/RUIControl.java b/src/HTML_Renderer/org/lobobrowser/html/renderer/RUIControl.java
index 97ee4153..6c632fe6 100644
--- a/src/HTML_Renderer/org/lobobrowser/html/renderer/RUIControl.java
+++ b/src/HTML_Renderer/org/lobobrowser/html/renderer/RUIControl.java
@@ -382,7 +382,7 @@ public LayoutValue(final int width, final int height) {
   }
 
   @Override
-  protected void doLayout(int availWidth, int availHeight, boolean expand, boolean sizeOnly) {
+  protected void doLayout(final int availWidth, final int availHeight, final boolean expand, final boolean sizeOnly) {
     // TODO: Is it okay to ignore `expand`?
     doLayout(availWidth, availHeight, sizeOnly);
   }
diff --git a/src/Platform_Core/org/lobobrowser/main/PlatformInit.java b/src/Platform_Core/org/lobobrowser/main/PlatformInit.java
index e6ad8db3..4d2b38ca 100644
--- a/src/Platform_Core/org/lobobrowser/main/PlatformInit.java
+++ b/src/Platform_Core/org/lobobrowser/main/PlatformInit.java
@@ -142,7 +142,7 @@ public void initLookAndFeel() throws Exception {
     // Set appropriate Swing L&F
     boolean nimbusApplied = false;
     try {
-      for (LookAndFeelInfo info : UIManager.getInstalledLookAndFeels()) {
+      for (final LookAndFeelInfo info : UIManager.getInstalledLookAndFeels()) {
         if ("Nimbus".equals(info.getName())) {
           UIManager.setLookAndFeel(info.getClassName());
           nimbusApplied = true;
diff --git a/src/Primary_Extension/org/lobobrowser/primary/clientlets/html/HtmlRendererContextImpl.java b/src/Primary_Extension/org/lobobrowser/primary/clientlets/html/HtmlRendererContextImpl.java
index dffde24f..be860b1a 100644
--- a/src/Primary_Extension/org/lobobrowser/primary/clientlets/html/HtmlRendererContextImpl.java
+++ b/src/Primary_Extension/org/lobobrowser/primary/clientlets/html/HtmlRendererContextImpl.java
@@ -376,7 +376,7 @@ private boolean populatePopupForElement(final HTMLElement element, final JPopupM
     boolean imageEntryAdded = false;
     Node currElement = element;
     while (currElement != null) {
-      if ((!linkEntryAdded) && currElement instanceof HTMLLinkElementImpl) {
+      if ((!linkEntryAdded) && (currElement instanceof HTMLLinkElementImpl)) {
         final HTMLLinkElementImpl link = (HTMLLinkElementImpl) currElement;
         final JMenuItem openLinkMenuItem = new JMenuItem("Open link in new window");
         openLinkMenuItem.addActionListener(e -> {
@@ -392,7 +392,7 @@ private boolean populatePopupForElement(final HTMLElement element, final JPopupM
         popupMenu.add(copyLinkMenuItem);
 
         linkEntryAdded = true;
-      } else if ((!imageEntryAdded) && currElement instanceof HTMLImageElementImpl) {
+      } else if ((!imageEntryAdded) && (currElement instanceof HTMLImageElementImpl)) {
         final HTMLImageElementImpl img = (HTMLImageElementImpl) currElement;
         try {
           final URL srcUrl = img.getFullURL(img.getSrc());