diff --git a/spring-core-1/initial/src/main/java/cholog/bean/AutowiredBean.java b/spring-core-1/initial/src/main/java/cholog/bean/AutowiredBean.java
index 02e1010d..3d76f041 100644
--- a/spring-core-1/initial/src/main/java/cholog/bean/AutowiredBean.java
+++ b/spring-core-1/initial/src/main/java/cholog/bean/AutowiredBean.java
@@ -5,12 +5,10 @@
 
 @Component
 public class AutowiredBean {
-    /*
-    어떤 방법으로 Component에 Bean을 주입하는지 학습하기
-     */
-    private SpringBean springBean;
+	@Autowired
+	private SpringBean springBean;
 
-    public String sayHello() {
-        return springBean.hello();
-    }
+	public String sayHello() {
+		return springBean.hello();
+	}
 }
diff --git a/spring-core-1/initial/src/main/java/cholog/bean/SpringBean.java b/spring-core-1/initial/src/main/java/cholog/bean/SpringBean.java
index 871bf83e..258c04a3 100644
--- a/spring-core-1/initial/src/main/java/cholog/bean/SpringBean.java
+++ b/spring-core-1/initial/src/main/java/cholog/bean/SpringBean.java
@@ -5,8 +5,9 @@
 /*
 어떤 어노테이션을 붙였을 때 Bean으로 생성되는지 학습하기
  */
+@Component
 public class SpringBean {
-    public String hello() {
-        return "Hello";
-    }
+	public String hello() {
+		return "Hello";
+	}
 }
diff --git a/spring-core-1/initial/src/main/java/cholog/di/ConstructorInjection.java b/spring-core-1/initial/src/main/java/cholog/di/ConstructorInjection.java
index 266e70b1..a3a4f66b 100644
--- a/spring-core-1/initial/src/main/java/cholog/di/ConstructorInjection.java
+++ b/spring-core-1/initial/src/main/java/cholog/di/ConstructorInjection.java
@@ -4,12 +4,13 @@
 
 @Service
 public class ConstructorInjection {
-    private InjectionBean injectionBean;
-
-    /*
-    ConstructorInjection으로 InjectionBean 주입받기
-     */
-    public String sayHello() {
-        return injectionBean.hello();
-    }
+	private InjectionBean injectionBean;
+
+	public ConstructorInjection(InjectionBean injectionBean) {
+		this.injectionBean = injectionBean;
+	}
+
+	public String sayHello() {
+		return injectionBean.hello();
+	}
 }
diff --git a/spring-core-1/initial/src/main/java/cholog/di/FieldInjection.java b/spring-core-1/initial/src/main/java/cholog/di/FieldInjection.java
index b2718b03..cdbbf9f0 100644
--- a/spring-core-1/initial/src/main/java/cholog/di/FieldInjection.java
+++ b/spring-core-1/initial/src/main/java/cholog/di/FieldInjection.java
@@ -5,13 +5,10 @@
 
 @Service
 public class FieldInjection {
+	@Autowired
+	private InjectionBean injectionBean;
 
-    /*
-    FieldInjection으로 InjectionBean 주입받기
-     */
-    private InjectionBean injectionBean;
-
-    public String sayHello() {
-        return injectionBean.hello();
-    }
+	public String sayHello() {
+		return injectionBean.hello();
+	}
 }
diff --git a/spring-core-1/initial/src/main/java/cholog/di/SetterInjection.java b/spring-core-1/initial/src/main/java/cholog/di/SetterInjection.java
index 7dc3f162..872bdfdf 100644
--- a/spring-core-1/initial/src/main/java/cholog/di/SetterInjection.java
+++ b/spring-core-1/initial/src/main/java/cholog/di/SetterInjection.java
@@ -5,13 +5,14 @@
 
 @Service
 public class SetterInjection {
-    private InjectionBean injectionBean;
+	private InjectionBean injectionBean;
 
-    /*
-    Setter Injection으로 InjectionBean 주입받기
-     */
+	@Autowired
+	public void setSetterInjection(InjectionBean injectionBean) {
+		this.injectionBean = injectionBean;
+	}
 
-    public String sayHello() {
-        return injectionBean.hello();
-    }
+	public String sayHello() {
+		return injectionBean.hello();
+	}
 }
diff --git a/spring-core-1/initial/src/main/java/cholog/scan/ContextConfiguration.java b/spring-core-1/initial/src/main/java/cholog/scan/ContextConfiguration.java
index ba2e8eb8..186e847d 100644
--- a/spring-core-1/initial/src/main/java/cholog/scan/ContextConfiguration.java
+++ b/spring-core-1/initial/src/main/java/cholog/scan/ContextConfiguration.java
@@ -1,10 +1,9 @@
 package cholog.scan;
 
+import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
-/*
-ComponentScan에 대해 학습하고, ComponenetScanBean을 Bean으로 등록하기
- */
+@ComponentScan(basePackages = {"cholog.scan"})
 public class ContextConfiguration {
 }