diff --git a/spring-quartz/src/main/java/org/baeldung/springquartz/basics/scheduler/QrtzScheduler.java b/spring-quartz/src/main/java/org/baeldung/springquartz/basics/scheduler/QrtzScheduler.java
index 73416262ce..ccf9fca8c1 100644
--- a/spring-quartz/src/main/java/org/baeldung/springquartz/basics/scheduler/QrtzScheduler.java
+++ b/spring-quartz/src/main/java/org/baeldung/springquartz/basics/scheduler/QrtzScheduler.java
@@ -1,5 +1,13 @@
 package org.baeldung.springquartz.basics.scheduler;
 
+import static org.quartz.JobBuilder.newJob;
+import static org.quartz.SimpleScheduleBuilder.simpleSchedule;
+import static org.quartz.TriggerBuilder.newTrigger;
+
+import java.io.IOException;
+
+import javax.annotation.PostConstruct;
+
 import org.baeldung.springquartz.config.AutoWiringSpringBeanJobFactory;
 import org.quartz.*;
 import org.slf4j.Logger;
@@ -14,19 +22,13 @@ import org.springframework.core.io.ClassPathResource;
 import org.springframework.scheduling.quartz.SchedulerFactoryBean;
 import org.springframework.scheduling.quartz.SpringBeanJobFactory;
 
-import javax.annotation.PostConstruct;
-import java.io.IOException;
 import java.util.Properties;
 
-import static org.quartz.JobBuilder.newJob;
-import static org.quartz.SimpleScheduleBuilder.simpleSchedule;
-import static org.quartz.TriggerBuilder.newTrigger;
-
 @Configuration
 @ConditionalOnExpression("'${using.spring.schedulerFactory}'=='false'")
 public class QrtzScheduler {
 
-    private static final Logger logger = LoggerFactory.getLogger(QrtzScheduler.class);
+    Logger logger = LoggerFactory.getLogger(getClass());
 
     @Autowired
     private ApplicationContext applicationContext;
@@ -74,11 +76,7 @@ public class QrtzScheduler {
     @Bean
     public JobDetail jobDetail() {
 
-        return newJob().ofType(SampleJob.class)
-                .storeDurably()
-                .withIdentity(JobKey.jobKey("Qrtz_Job_Detail"))
-                .withDescription("Invoke Sample Job service...")
-                .build();
+        return newJob().ofType(SampleJob.class).storeDurably().withIdentity(JobKey.jobKey("Qrtz_Job_Detail")).withDescription("Invoke Sample Job service...").build();
     }
 
     @Bean
@@ -87,10 +85,6 @@ public class QrtzScheduler {
         int frequencyInSec = 10;
         logger.info("Configuring trigger to fire every {} seconds", frequencyInSec);
 
-        return newTrigger().forJob(job)
-                .withIdentity(TriggerKey.triggerKey("Qrtz_Trigger"))
-                .withDescription("Sample trigger")
-                .withSchedule(simpleSchedule().withIntervalInSeconds(frequencyInSec).repeatForever())
-                .build();
+        return newTrigger().forJob(job).withIdentity(TriggerKey.triggerKey("Qrtz_Trigger")).withDescription("Sample trigger").withSchedule(simpleSchedule().withIntervalInSeconds(frequencyInSec).repeatForever()).build();
     }
 }
diff --git a/spring-quartz/src/main/java/org/baeldung/springquartz/basics/scheduler/SampleJob.java b/spring-quartz/src/main/java/org/baeldung/springquartz/basics/scheduler/SampleJob.java
index 8bfd856b86..7c50f9a231 100644
--- a/spring-quartz/src/main/java/org/baeldung/springquartz/basics/scheduler/SampleJob.java
+++ b/spring-quartz/src/main/java/org/baeldung/springquartz/basics/scheduler/SampleJob.java
@@ -12,7 +12,7 @@ import org.springframework.stereotype.Component;
 @Component
 public class SampleJob implements Job {
 
-    private static final Logger logger = LoggerFactory.getLogger(SampleJob.class);
+    Logger logger = LoggerFactory.getLogger(getClass());
 
     @Autowired
     private SampleJobService jobService;
diff --git a/spring-quartz/src/main/java/org/baeldung/springquartz/basics/scheduler/SpringQrtzScheduler.java b/spring-quartz/src/main/java/org/baeldung/springquartz/basics/scheduler/SpringQrtzScheduler.java
index 40234df1c9..f824765efe 100644
--- a/spring-quartz/src/main/java/org/baeldung/springquartz/basics/scheduler/SpringQrtzScheduler.java
+++ b/spring-quartz/src/main/java/org/baeldung/springquartz/basics/scheduler/SpringQrtzScheduler.java
@@ -1,5 +1,8 @@
 package org.baeldung.springquartz.basics.scheduler;
 
+import javax.annotation.PostConstruct;
+import javax.sql.DataSource;
+
 import org.baeldung.springquartz.config.AutoWiringSpringBeanJobFactory;
 import org.quartz.JobDetail;
 import org.quartz.SimpleTrigger;
@@ -21,15 +24,12 @@ import org.springframework.scheduling.quartz.SchedulerFactoryBean;
 import org.springframework.scheduling.quartz.SimpleTriggerFactoryBean;
 import org.springframework.scheduling.quartz.SpringBeanJobFactory;
 
-import javax.annotation.PostConstruct;
-import javax.sql.DataSource;
-
 @Configuration
 @EnableAutoConfiguration
 @ConditionalOnExpression("'${using.spring.schedulerFactory}'=='true'")
 public class SpringQrtzScheduler {
 
-    private static final Logger logger = LoggerFactory.getLogger(SpringQrtzScheduler.class);
+    Logger logger = LoggerFactory.getLogger(getClass());
 
     @Autowired
     private ApplicationContext applicationContext;
@@ -49,9 +49,7 @@ public class SpringQrtzScheduler {
     }
 
     @Bean
-    public SchedulerFactoryBean scheduler(Trigger trigger,
-                                          JobDetail job,
-                                          DataSource quartzDataSource) {
+    public SchedulerFactoryBean scheduler(Trigger trigger, JobDetail job, DataSource quartzDataSource) {
 
         SchedulerFactoryBean schedulerFactory = new SchedulerFactoryBean();
         schedulerFactory.setConfigLocation(new ClassPathResource("quartz.properties"));
diff --git a/spring-quartz/src/main/java/org/baeldung/springquartz/basics/service/SampleJobService.java b/spring-quartz/src/main/java/org/baeldung/springquartz/basics/service/SampleJobService.java
index 4b976d37b0..6f66352616 100644
--- a/spring-quartz/src/main/java/org/baeldung/springquartz/basics/service/SampleJobService.java
+++ b/spring-quartz/src/main/java/org/baeldung/springquartz/basics/service/SampleJobService.java
@@ -11,7 +11,7 @@ public class SampleJobService {
 
     public static final long EXECUTION_TIME = 5000L;
 
-    private static final Logger logger = LoggerFactory.getLogger(SampleJobService.class);
+    private Logger logger = LoggerFactory.getLogger(getClass());
 
     private AtomicInteger count = new AtomicInteger();