diff --git a/core/api/src/main/java/org/onosproject/core/ApplicationRole.java b/core/api/src/main/java/org/onosproject/core/ApplicationRole.java
index 0edf28f..73685b5c 100644
--- a/core/api/src/main/java/org/onosproject/core/ApplicationRole.java
+++ b/core/api/src/main/java/org/onosproject/core/ApplicationRole.java
@@ -32,7 +32,7 @@
      */
     UNSPECIFIED,
 
-    /**
+    /*
      * More useful roles may be defined.
      */
 }
diff --git a/core/common/src/test/java/org/onosproject/store/trivial/SimpleDeviceStoreTest.java b/core/common/src/test/java/org/onosproject/store/trivial/SimpleDeviceStoreTest.java
index af6e466..b71faef 100644
--- a/core/common/src/test/java/org/onosproject/store/trivial/SimpleDeviceStoreTest.java
+++ b/core/common/src/test/java/org/onosproject/store/trivial/SimpleDeviceStoreTest.java
@@ -14,9 +14,6 @@
  * limitations under the License.
  */
 
-/**
- *
- */
 package org.onosproject.store.trivial;
 
 import static org.junit.Assert.*;
diff --git a/core/net/src/test/java/org/onosproject/net/intent/impl/compiler/PathIntentCompilerTest.java b/core/net/src/test/java/org/onosproject/net/intent/impl/compiler/PathIntentCompilerTest.java
index b3efb24..a636fd4 100644
--- a/core/net/src/test/java/org/onosproject/net/intent/impl/compiler/PathIntentCompilerTest.java
+++ b/core/net/src/test/java/org/onosproject/net/intent/impl/compiler/PathIntentCompilerTest.java
@@ -942,7 +942,7 @@
 
             assertTrue(VlanId.NO_VID < vlanToEncap.toShort() && vlanToEncap.toShort() < VlanId.MAX_VLAN);
 
-            /**
+            /*
              * This second part is meant to test if the random selection is working properly.
              * We are compiling the same intent in order to verify if the VLAN ID is different
              * from the previous one.
diff --git a/core/store/persistence/src/main/java/org/onosproject/persistence/impl/PersistenceException.java b/core/store/persistence/src/main/java/org/onosproject/persistence/impl/PersistenceException.java
index 4fc0fa9..7056f50 100644
--- a/core/store/persistence/src/main/java/org/onosproject/persistence/impl/PersistenceException.java
+++ b/core/store/persistence/src/main/java/org/onosproject/persistence/impl/PersistenceException.java
@@ -19,11 +19,10 @@
 /**
  * An exception defined for failures of the local persistent store system.
  */
-
-/**
- * Throws an exception with the specified message.
- */
 public class PersistenceException extends RuntimeException {
+    /**
+     * Throws an exception with the specified message.
+     */
     public PersistenceException(String s) {
         super(s);
     }