diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/PasswordMaskingUtil.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/PasswordMaskingUtil.java
index 796f1d823c..e9df0b263e 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/PasswordMaskingUtil.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/PasswordMaskingUtil.java
@@ -123,7 +123,7 @@ public final class PasswordMaskingUtil {
    }
 
    private static boolean isEncoded(String storedPassword) {
-      return storedPassword == null || (isEncMasked(storedPassword));
+      return storedPassword == null || isEncMasked(storedPassword);
    }
 
    public static HashProcessor getHashProcessor() {
@@ -164,7 +164,7 @@ public final class PasswordMaskingUtil {
          try {
             // Service load the codec, if a service is available
             for (SensitiveDataCodec<String> codec : serviceLoader) {
-               if ((codec.getClass().getCanonicalName()).equals(codecClassName)) {
+               if (codec.getClass().getCanonicalName().equals(codecClassName)) {
                   return codec.getClass().newInstance();
                }
             }
diff --git a/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/collections/ConcurrentAppendOnlyChunkedListTest.java b/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/collections/ConcurrentAppendOnlyChunkedListTest.java
index a4f405971a..922c78024b 100644
--- a/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/collections/ConcurrentAppendOnlyChunkedListTest.java
+++ b/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/collections/ConcurrentAppendOnlyChunkedListTest.java
@@ -49,7 +49,7 @@ public class ConcurrentAppendOnlyChunkedListTest {
       final int messages = ELEMENTS;
       for (int i = 0; i < messages; i++) {
          Assert.assertEquals(i, chunkedList.size());
-         chunkedList.add((i));
+         chunkedList.add(i);
       }
       Assert.assertEquals(messages, chunkedList.size());
    }
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/InflaterReader.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/InflaterReader.java
index 62e118cab9..183989f4f0 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/InflaterReader.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/InflaterReader.java
@@ -56,9 +56,7 @@ public class InflaterReader extends InputStream {
             }
             pointer = 0;
          } catch (DataFormatException e) {
-            IOException e2 = new IOException(e.getMessage());
-            e2.initCause(e);
-            throw e2;
+            throw new IOException(e.getMessage(), e);
          }
       }
 
diff --git a/artemis-core-client/src/test/java/org/apache/activemq/artemis/core/remoting/impl/netty/SharedEventLoopGroupTest.java b/artemis-core-client/src/test/java/org/apache/activemq/artemis/core/remoting/impl/netty/SharedEventLoopGroupTest.java
index bb5cbb7b30..618d5ebf61 100644
--- a/artemis-core-client/src/test/java/org/apache/activemq/artemis/core/remoting/impl/netty/SharedEventLoopGroupTest.java
+++ b/artemis-core-client/src/test/java/org/apache/activemq/artemis/core/remoting/impl/netty/SharedEventLoopGroupTest.java
@@ -37,7 +37,7 @@ public class SharedEventLoopGroupTest {
       Thread t1 = new Thread(new Runnable() {
          @Override
          public void run() {
-            sharedEventLoopGroup1.set(SharedEventLoopGroup.getInstance((threadFactory -> customNioEventLoopGroup)));
+            sharedEventLoopGroup1.set(SharedEventLoopGroup.getInstance(threadFactory -> customNioEventLoopGroup));
             customNioEventLoopGroup.setCyclicBarrier(barrier);
             sharedEventLoopGroup1.get().shutdownGracefully();
             customNioEventLoopGroup.setCyclicBarrier(null);
@@ -51,7 +51,7 @@ public class SharedEventLoopGroupTest {
          public void run() {
             try {
                barrier.await();
-               sharedEventLoopGroup2.set(SharedEventLoopGroup.getInstance((threadFactory -> new NioEventLoopGroup(2, threadFactory))));
+               sharedEventLoopGroup2.set(SharedEventLoopGroup.getInstance(threadFactory -> new NioEventLoopGroup(2, threadFactory)));
             } catch (InterruptedException e) {
                e.printStackTrace();
             } catch (BrokenBarrierException e) {
diff --git a/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/html/brokerDiagram.html b/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/html/brokerDiagram.html
index 9d0fd05ea4..f97ecdd53b 100644
--- a/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/html/brokerDiagram.html
+++ b/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/html/brokerDiagram.html
@@ -82,7 +82,7 @@ rect.graphbox.frame {
 path.link {
   fill: none;
   stroke: #666;
-  stroke-width: 1.5px;  b
+  stroke-width: 1.5px;
 }
 
 marker.broker {
diff --git a/artemis-jms-client/src/test/java/org/apache/activemq/artemis/uri/ConnectionFactoryURITest.java b/artemis-jms-client/src/test/java/org/apache/activemq/artemis/uri/ConnectionFactoryURITest.java
index 9c1b9b8d6c..e23971a6fd 100644
--- a/artemis-jms-client/src/test/java/org/apache/activemq/artemis/uri/ConnectionFactoryURITest.java
+++ b/artemis-jms-client/src/test/java/org/apache/activemq/artemis/uri/ConnectionFactoryURITest.java
@@ -212,7 +212,7 @@ public class ConnectionFactoryURITest {
       populateConnectorParams(props3, allowableConnectorKeys, sb);
       sb.append(")?ha=true&clientID=myID");
 
-      ActiveMQConnectionFactory factory = parser.newObject(parser.expandURI((sb.toString())), null);
+      ActiveMQConnectionFactory factory = parser.newObject(parser.expandURI(sb.toString()), null);
 
       TransportConfiguration[] staticConnectors = factory.getStaticConnectors();
       Assert.assertEquals(3, staticConnectors.length);
diff --git a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/package.html b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/package.html
index de1602c3a8..274259d655 100644
--- a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/package.html
+++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/package.html
@@ -2,7 +2,6 @@
 <html>
   <head>
     <!-- $Id: package.html 71554 2008-04-01 13:25:40Z adrian@jboss.org $ -->
-    <!--
 <!--
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements. See the NOTICE file distributed with
diff --git a/examples/features/standard/rest/jms-to-rest/postOrder.py b/examples/features/standard/rest/jms-to-rest/postOrder.py
index a9b96d248b..7a3086453d 100644
--- a/examples/features/standard/rest/jms-to-rest/postOrder.py
+++ b/examples/features/standard/rest/jms-to-rest/postOrder.py
@@ -14,7 +14,8 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-import httplib, urlparse
+import httplib
+import urlparse
 
 conn = httplib.HTTPConnection("localhost:8080")
 conn.request("HEAD", "/queues/orders")
@@ -25,7 +26,7 @@ conn.close()
 
 createParsed = urlparse.urlparse(createLink)
 conn = httplib.HTTPConnection(createParsed.netloc)
-headers = {'Content-Type' : 'application/xml'}
+headers = {'Content-Type': 'application/xml'}
 xml = """<?xml version="1.0"?>
 <order>
    <name>Bill</name>
diff --git a/examples/features/standard/rest/jms-to-rest/receiveOrder.py b/examples/features/standard/rest/jms-to-rest/receiveOrder.py
index 2e86515a80..4d3c3f4ded 100644
--- a/examples/features/standard/rest/jms-to-rest/receiveOrder.py
+++ b/examples/features/standard/rest/jms-to-rest/receiveOrder.py
@@ -14,7 +14,8 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-import httplib, urlparse
+import httplib
+import urlparse
 
 conn = httplib.HTTPConnection("localhost:8080")
 conn.request("HEAD", "/queues/orders")
@@ -29,7 +30,7 @@ session = res.getheader("Location")
 print consumeLink
 conn.close()
 
-headers = {"Accept-Wait" : "3", "Accept" : "application/xml"}
+headers = {"Accept-Wait": "3", "Accept": "application/xml"}
 
 try:
     print "Waiting..."
@@ -49,7 +50,7 @@ try:
         else:
             raise Exception('failed')
 finally:
-    if session != None:
+    if session is not None:
         print "deleting activemq session..."
         createParsed = urlparse.urlparse(session)
         conn = httplib.HTTPConnection(createParsed.netloc)
diff --git a/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/util/IdGenerator.java b/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/util/IdGenerator.java
index b5c7478d87..f93ca6ea8c 100644
--- a/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/util/IdGenerator.java
+++ b/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/util/IdGenerator.java
@@ -250,7 +250,7 @@ public class IdGenerator {
     */
    protected static String getLocalHostName() throws UnknownHostException {
       try {
-         return (InetAddress.getLocalHost()).getHostName();
+         return InetAddress.getLocalHost().getHostName();
       } catch (UnknownHostException uhe) {
          String host = uhe.getMessage(); // host = "hostname: hostname"
          if (host != null) {
diff --git a/tests/timing-tests/src/test/java/org/apache/activemq/artemis/tests/timing/util/TokenBucketLimiterImplTest.java b/tests/timing-tests/src/test/java/org/apache/activemq/artemis/tests/timing/util/TokenBucketLimiterImplTest.java
index 1f8bff1d59..6d92738a23 100644
--- a/tests/timing-tests/src/test/java/org/apache/activemq/artemis/tests/timing/util/TokenBucketLimiterImplTest.java
+++ b/tests/timing-tests/src/test/java/org/apache/activemq/artemis/tests/timing/util/TokenBucketLimiterImplTest.java
@@ -180,7 +180,7 @@ public class TokenBucketLimiterImplTest extends ActiveMQTestBase {
                if (lastRun != 0) {
                   int consumed = tmpValue - lastRun;
 
-                  double calculatedRate = consumed * window * 1000 / ((System.currentTimeMillis() - lastTime));
+                  double calculatedRate = consumed * window * 1000 / (System.currentTimeMillis() - lastTime);
 
                   if (calculatedRate > rate * error) {
                      System.out.println("got more than " + rate + " tokens / second");