diff --git a/cdi/src/main/java/com/baeldung/interceptor/Audited.java b/cdi/src/main/java/com/baeldung/interceptor/Audited.java
index 4065450b09..3df4bef95e 100644
--- a/cdi/src/main/java/com/baeldung/interceptor/Audited.java
+++ b/cdi/src/main/java/com/baeldung/interceptor/Audited.java
@@ -1,12 +1,14 @@
 package com.baeldung.interceptor;
 
-import javax.interceptor.InterceptorBinding;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+import javax.interceptor.InterceptorBinding;
+
 @InterceptorBinding
-@Target( {ElementType.METHOD, ElementType.TYPE } )
-@Retention(RetentionPolicy.RUNTIME )
-public @interface Audited {}
+@Target({ ElementType.METHOD, ElementType.TYPE })
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Audited {
+}
diff --git a/cdi/src/main/java/com/baeldung/interceptor/AuditedInterceptor.java b/cdi/src/main/java/com/baeldung/interceptor/AuditedInterceptor.java
index 46ab9b33c8..c62d9a4127 100644
--- a/cdi/src/main/java/com/baeldung/interceptor/AuditedInterceptor.java
+++ b/cdi/src/main/java/com/baeldung/interceptor/AuditedInterceptor.java
@@ -3,12 +3,13 @@ package com.baeldung.interceptor;
 import javax.interceptor.AroundInvoke;
 import javax.interceptor.Interceptor;
 import javax.interceptor.InvocationContext;
-import java.lang.reflect.Method;
 
-@Audited @Interceptor
+@Audited
+@Interceptor
 public class AuditedInterceptor {
     public static boolean calledBefore = false;
     public static boolean calledAfter = false;
+
     @AroundInvoke
     public Object auditMethod(InvocationContext ctx) throws Exception {
         calledBefore = true;
diff --git a/cdi/src/main/java/com/baeldung/service/SuperService.java b/cdi/src/main/java/com/baeldung/service/SuperService.java
index e1e57a4e0d..e15f049342 100644
--- a/cdi/src/main/java/com/baeldung/service/SuperService.java
+++ b/cdi/src/main/java/com/baeldung/service/SuperService.java
@@ -5,6 +5,6 @@ import com.baeldung.interceptor.Audited;
 public class SuperService {
     @Audited
     public String deliverService(String uid) {
-       return uid;
+        return uid;
     }
 }
diff --git a/cdi/src/main/java/com/baeldung/spring/aspect/SpringTestAspect.java b/cdi/src/main/java/com/baeldung/spring/aspect/SpringTestAspect.java
index 8c2ff2600b..e48039706d 100644
--- a/cdi/src/main/java/com/baeldung/spring/aspect/SpringTestAspect.java
+++ b/cdi/src/main/java/com/baeldung/spring/aspect/SpringTestAspect.java
@@ -1,26 +1,23 @@
 package com.baeldung.spring.aspect;
 
-import org.aspectj.lang.JoinPoint;
+import java.util.List;
+
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
-import org.aspectj.lang.annotation.Before;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import javax.inject.Inject;
-import java.util.List;
-
 @Aspect
 public class SpringTestAspect {
     @Autowired
     private List<String> accumulator;
 
     @Around("execution(* com.baeldung.spring.service.SpringSuperService.*(..))")
-    public Object advice(ProceedingJoinPoint jp) throws Throwable {
+    public Object auditMethod(ProceedingJoinPoint jp) throws Throwable {
         String methodName = jp.getSignature().getName();
-        accumulator.add("Call to "+methodName);
+        accumulator.add("Call to " + methodName);
         Object obj = jp.proceed();
-        accumulator.add("Method called successfully: "+methodName);
+        accumulator.add("Method called successfully: " + methodName);
         return obj;
     }
 }
diff --git a/cdi/src/main/java/com/baeldung/spring/configuration/AppConfig.java b/cdi/src/main/java/com/baeldung/spring/configuration/AppConfig.java
index 6cfc8f8743..b30c4a1326 100644
--- a/cdi/src/main/java/com/baeldung/spring/configuration/AppConfig.java
+++ b/cdi/src/main/java/com/baeldung/spring/configuration/AppConfig.java
@@ -1,13 +1,14 @@
 package com.baeldung.spring.configuration;
 
-import com.baeldung.spring.aspect.SpringTestAspect;
-import com.baeldung.spring.service.SpringSuperService;
+import java.util.ArrayList;
+import java.util.List;
+
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.EnableAspectJAutoProxy;
 
-import java.util.ArrayList;
-import java.util.List;
+import com.baeldung.spring.aspect.SpringTestAspect;
+import com.baeldung.spring.service.SpringSuperService;
 
 @Configuration
 @EnableAspectJAutoProxy
@@ -18,12 +19,12 @@ public class AppConfig {
     }
 
     @Bean
-    public SpringTestAspect springTestAspect(){
+    public SpringTestAspect springTestAspect() {
         return new SpringTestAspect();
     }
 
     @Bean
-    public List<String> getAccumulator(){
+    public List<String> getAccumulator() {
         return new ArrayList<String>();
     }
 }
diff --git a/cdi/src/main/java/com/baeldung/spring/service/SpringSuperService.java b/cdi/src/main/java/com/baeldung/spring/service/SpringSuperService.java
index 72dbd1c006..082eb2e0f8 100644
--- a/cdi/src/main/java/com/baeldung/spring/service/SpringSuperService.java
+++ b/cdi/src/main/java/com/baeldung/spring/service/SpringSuperService.java
@@ -1,7 +1,7 @@
 package com.baeldung.spring.service;
 
 public class SpringSuperService {
-    public String getInfoFromService(String code){
+    public String getInfoFromService(String code) {
         return code;
     }
 }
diff --git a/cdi/src/test/java/com/baeldung/test/TestInterceptor.java b/cdi/src/test/java/com/baeldung/test/TestInterceptor.java
index d1b851c94f..406296529c 100644
--- a/cdi/src/test/java/com/baeldung/test/TestInterceptor.java
+++ b/cdi/src/test/java/com/baeldung/test/TestInterceptor.java
@@ -1,8 +1,5 @@
 package com.baeldung.test;
 
-import com.baeldung.interceptor.Audited;
-import com.baeldung.interceptor.AuditedInterceptor;
-import com.baeldung.service.SuperService;
 import org.jboss.weld.environment.se.Weld;
 import org.jboss.weld.environment.se.WeldContainer;
 import org.junit.After;
@@ -10,24 +7,21 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.InterceptionType;
-import javax.enterprise.inject.spi.Interceptor;
-import javax.enterprise.util.AnnotationLiteral;
-
-import static javafx.beans.binding.Bindings.select;
+import com.baeldung.interceptor.AuditedInterceptor;
+import com.baeldung.service.SuperService;
 
 public class TestInterceptor {
     Weld weld;
     WeldContainer container;
+
     @Before
-    public void init(){
+    public void init() {
         weld = new Weld();
         container = weld.initialize();
     }
 
     @After
-    public void shutdown(){
+    public void shutdown() {
         weld.shutdown();
     }
 
diff --git a/cdi/src/test/java/com/baeldung/test/TestSpringInterceptor.java b/cdi/src/test/java/com/baeldung/test/TestSpringInterceptor.java
index b5aedd4b76..1f3a8d83e3 100644
--- a/cdi/src/test/java/com/baeldung/test/TestSpringInterceptor.java
+++ b/cdi/src/test/java/com/baeldung/test/TestSpringInterceptor.java
@@ -1,25 +1,21 @@
 package com.baeldung.test;
 
-import com.baeldung.spring.configuration.AppConfig;
-import com.baeldung.spring.service.SpringSuperService;
+import static org.hamcrest.CoreMatchers.is;
+
+import java.util.List;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.TestExecutionListeners;
 import org.springframework.test.context.junit4.SpringRunner;
-import org.springframework.test.context.support.DependencyInjectionTestExecutionListener;
-import org.springframework.test.context.support.DirtiesContextTestExecutionListener;
-import org.springframework.test.context.transaction.TransactionalTestExecutionListener;
 
-import javax.inject.Inject;
-import java.util.List;
-
-import static org.hamcrest.CoreMatchers.is;
+import com.baeldung.spring.configuration.AppConfig;
+import com.baeldung.spring.service.SpringSuperService;
 
 @RunWith(SpringRunner.class)
-@ContextConfiguration(classes = {AppConfig.class})
+@ContextConfiguration(classes = { AppConfig.class })
 public class TestSpringInterceptor {
     @Autowired
     SpringSuperService springSuperService;
@@ -28,11 +24,11 @@ public class TestSpringInterceptor {
     private List<String> accumulator;
 
     @Test
-    public void givenService_whenServiceAndAspectExecuted_thenOk(){
+    public void givenService_whenServiceAndAspectExecuted_thenOk() {
         String code = "123456";
         String result = springSuperService.getInfoFromService(code);
         Assert.assertThat(accumulator.size(), is(2));
-        Assert.assertThat(accumulator.get(0),is("Call to getInfoFromService"));
-        Assert.assertThat(accumulator.get(1),is("Method called successfully: getInfoFromService"));
+        Assert.assertThat(accumulator.get(0), is("Call to getInfoFromService"));
+        Assert.assertThat(accumulator.get(1), is("Method called successfully: getInfoFromService"));
     }
 }