diff --git a/src/main/java/org/audit4j/core/annotation/Audit.java b/src/main/java/org/audit4j/core/annotation/Audit.java
index 843d72a..aba1fa2 100644
--- a/src/main/java/org/audit4j/core/annotation/Audit.java
+++ b/src/main/java/org/audit4j/core/annotation/Audit.java
@@ -48,8 +48,7 @@
      * 
      * @return the string
      */
-    @Nonbinding
-    public String action() default "action";
+    @Nonbinding String action() default "action";
 
     /**
      * Selection.
@@ -58,8 +57,7 @@
      * @deprecated : this attribute is no longer using. 
      */
     @Deprecated
-    @Nonbinding
-    public SelectionType selection() default SelectionType.ALL;
+    @Nonbinding SelectionType selection() default SelectionType.ALL;
 
     /**
      * Tag.
@@ -68,8 +66,7 @@
      * @deprecated see repository for more information. Repository.
      */
     @Deprecated
-    @Nonbinding
-    public String tag() default "default";
+    @Nonbinding String tag() default "default";
 
     /**
      * Repository. This attribute using to define the repository where audit log
@@ -77,6 +74,5 @@
      *
      * @return the string
      */
-    @Nonbinding
-    public String repository() default "default";
+    @Nonbinding String repository() default "default";
 }
\ No newline at end of file
diff --git a/src/main/java/org/audit4j/core/annotation/AuditField.java b/src/main/java/org/audit4j/core/annotation/AuditField.java
index 41394da..aa60734 100644
--- a/src/main/java/org/audit4j/core/annotation/AuditField.java
+++ b/src/main/java/org/audit4j/core/annotation/AuditField.java
@@ -44,5 +44,5 @@
      * 
      * @return the string
      */
-    public String field();
+    String field();
 }
diff --git a/src/main/java/org/audit4j/core/annotation/DeIdentify.java b/src/main/java/org/audit4j/core/annotation/DeIdentify.java
index 1e8b6fe..4565203 100644
--- a/src/main/java/org/audit4j/core/annotation/DeIdentify.java
+++ b/src/main/java/org/audit4j/core/annotation/DeIdentify.java
@@ -44,27 +44,27 @@
      * 
      * @return the int
      */
-    public int left() default 0;
+    int left() default 0;
 
     /**
      * Right.
      * 
      * @return the int
      */
-    public int right() default 0;
+    int right() default 0;
 
     /**
      * From left.
      * 
      * @return the int
      */
-    public int fromLeft() default 0;
+    int fromLeft() default 0;
 
     /**
      * From right.
      * 
      * @return the int
      */
-    public int fromRight() default 0;
+    int fromRight() default 0;
 
 }
diff --git a/src/main/java/org/audit4j/core/filter/AuditEventFilter.java b/src/main/java/org/audit4j/core/filter/AuditEventFilter.java
index 51772db..7751b55 100644
--- a/src/main/java/org/audit4j/core/filter/AuditEventFilter.java
+++ b/src/main/java/org/audit4j/core/filter/AuditEventFilter.java
@@ -32,7 +32,7 @@
  */
 public interface AuditEventFilter<T extends Event> extends Serializable {
     
-    public POJOQuery<AuditEvent> query = new POJOQuery<>();
+    POJOQuery<AuditEvent> query = new POJOQuery<>();
     
     /**
      * Accepts.
diff --git a/src/main/java/org/audit4j/core/util/annotation/NotThreadSafe.java b/src/main/java/org/audit4j/core/util/annotation/NotThreadSafe.java
index f5f6118..02bd35a 100644
--- a/src/main/java/org/audit4j/core/util/annotation/NotThreadSafe.java
+++ b/src/main/java/org/audit4j/core/util/annotation/NotThreadSafe.java
@@ -42,5 +42,5 @@
      *
      * @return the string
      */
-    public String value() default "";
+    String value() default "";
 }
diff --git a/src/main/java/org/audit4j/core/util/annotation/ThreadSafe.java b/src/main/java/org/audit4j/core/util/annotation/ThreadSafe.java
index 924ff73..2b517c9 100644
--- a/src/main/java/org/audit4j/core/util/annotation/ThreadSafe.java
+++ b/src/main/java/org/audit4j/core/util/annotation/ThreadSafe.java
@@ -42,5 +42,5 @@
      *
      * @return the string
      */
-    public String value() default "";
+    String value() default "";
 }
diff --git a/src/test/java/org/audit4j/core/Audit4jTestBase.java b/src/test/java/org/audit4j/core/Audit4jTestBase.java
index 7ecc1b3..73c8609 100644
--- a/src/test/java/org/audit4j/core/Audit4jTestBase.java
+++ b/src/test/java/org/audit4j/core/Audit4jTestBase.java
@@ -23,7 +23,7 @@ protected AuditEvent getSampleAuditEvent() {
         String actor = "Dummy Actor";
         EventBuilder builder = new EventBuilder();
         builder.addTimestamp(new Date()).addActor(actor).addAction("myMethod").addOrigin("Origin").addField("myParam1Name", "param1")
-                .addField("myParam2Name", new Integer(2));
+                .addField("myParam2Name", 2);
         return builder.build();
     }
     
@@ -31,7 +31,7 @@ protected AuditEvent getSampleAuditEvent(String action) {
         String actor = "Dummy Actor";
         EventBuilder builder = new EventBuilder();
         builder.addTimestamp(new Date()).addActor(actor).addAction(action).addOrigin("Origin").addField("myParam1Name", "param1")
-                .addField("myParam2Name", new Integer(2));
+                .addField("myParam2Name", 2);
         return builder.build();
     }
 
diff --git a/src/test/java/org/audit4j/core/dto/AuditBaseTest.java b/src/test/java/org/audit4j/core/dto/AuditBaseTest.java
index e157090..7165d96 100644
--- a/src/test/java/org/audit4j/core/dto/AuditBaseTest.java
+++ b/src/test/java/org/audit4j/core/dto/AuditBaseTest.java
@@ -42,7 +42,7 @@ public void testAuditBase_1()
     public void testGetTimestamp_1()
         throws Exception {
         Event fixture = new Event();
-        fixture.setUuid(new Long(1L));
+        fixture.setUuid(1L);
         fixture.setTimestamp(new Date());
 
         Date result = fixture.getTimestamp();
@@ -64,7 +64,7 @@ public void testGetTimestamp_1()
     public void testGetUuid_1()
         throws Exception {
         Event fixture = new Event();
-        fixture.setUuid(new Long(1L));
+        fixture.setUuid(1L);
         fixture.setTimestamp(new Date());
 
         Long result = fixture.getUuid();
@@ -91,9 +91,9 @@ public void testGetUuid_1()
     public void testSetAuditId_1()
         throws Exception {
         Event fixture = new Event();
-        fixture.setUuid(new Long(1L));
+        fixture.setUuid(1L);
         fixture.setTimestamp(new Date());
-        Integer auditId = new Integer(1);
+        Integer auditId = 1;
 
 
         // add additional test code here
@@ -110,7 +110,7 @@ public void testSetAuditId_1()
     public void testSetTimestamp_1()
         throws Exception {
         Event fixture = new Event();
-        fixture.setUuid(new Long(1L));
+        fixture.setUuid(1L);
         fixture.setTimestamp(new Date());
         Date timestamp = new Date();
 
@@ -130,9 +130,9 @@ public void testSetTimestamp_1()
     public void testSetUuid_1()
         throws Exception {
         Event fixture = new Event();
-        fixture.setUuid(new Long(1L));
+        fixture.setUuid(1L);
         fixture.setTimestamp(new Date());
-        Long uuid = new Long(1L);
+        Long uuid = 1L;
 
         fixture.setUuid(uuid);
 
diff --git a/src/test/java/org/audit4j/core/dto/EventBuilderTest.java b/src/test/java/org/audit4j/core/dto/EventBuilderTest.java
index 048c862..ad56ca6 100644
--- a/src/test/java/org/audit4j/core/dto/EventBuilderTest.java
+++ b/src/test/java/org/audit4j/core/dto/EventBuilderTest.java
@@ -15,7 +15,7 @@ public void testEventBuilder() {
         watch.start("builder");
         EventBuilder builder = new EventBuilder();
         builder.addActor("Actor").addAction("myMethod").addOrigin("Origin1").addField("myParam1Name", "param1")
-                .addField("myParam2Name", new Integer(2));
+                .addField("myParam2Name", 2);
         AuditEvent event = builder.build();
         watch.stop();
         Log.info(watch.getLastTaskTimeMillis());
diff --git a/src/test/java/org/audit4j/core/smoke/SmokeTest.java b/src/test/java/org/audit4j/core/smoke/SmokeTest.java
index 45883be..3daee8d 100644
--- a/src/test/java/org/audit4j/core/smoke/SmokeTest.java
+++ b/src/test/java/org/audit4j/core/smoke/SmokeTest.java
@@ -26,7 +26,7 @@ public void smokeTestAuditEvent() throws InterruptedException {
         String actor = "Dummy Actor";
         EventBuilder builder = new EventBuilder();
         builder.addActor(actor).addAction("myMethod").addOrigin("Origin1").addField("myParam1Name", "param1")
-                .addField("myParam2Name", new Integer(2));
+                .addField("myParam2Name", 2);
         AuditEvent event = builder.build();
         watch.stop();
         Log.info(watch.getTotalTime());
@@ -51,7 +51,7 @@ public static void main(String[] args) {
         while (count < 100000) {
             EventBuilder builder = new EventBuilder();
             builder.addActor("Dummy Actor").addAction("myMethod").addOrigin("Origin1")
-                    .addField("myParam1Name", "param1").addField("myParam2Name", new Integer(2));
+                    .addField("myParam1Name", "param1").addField("myParam2Name", 2);
             AuditEvent event = builder.build();
             manager.audit(event);
             count++;