diff --git a/app/build.gradle b/app/build.gradle
index e778a2b..f7da275 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -27,26 +27,26 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
     androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
 
-    compile 'com.android.support:appcompat-v7:26.1.0'
-    compile 'com.android.support.constraint:constraint-layout:1.0.2'
-    testCompile 'junit:junit:4.12'
+    implementation 'com.android.support:appcompat-v7:26.1.0'
+    implementation 'com.android.support.constraint:constraint-layout:1.0.2'
+    testImplementation 'junit:junit:4.12'
 
     // for data binding
     kapt 'com.android.databinding:compiler:3.0.0'
 
     // for dagger2
-    compile "com.google.dagger:dagger:2.12"
+    implementation "com.google.dagger:dagger:2.12"
     annotationProcessor "com.google.dagger:dagger-compiler:2.12"
     kapt "com.google.dagger:dagger-compiler:2.12"
 
     // for orma database
-    compile "com.github.gfx.android.orma:orma:4.2.5"
+    implementation "com.github.gfx.android.orma:orma:4.2.5"
     kapt "com.github.gfx.android.orma:orma-processor:4.2.5"
 
 
diff --git a/app/src/main/java/jp/chau2chaun2/kotlindatabindingsample/presenter/PersonPresenter.kt b/app/src/main/java/jp/chau2chaun2/kotlindatabindingsample/presenter/PersonPresenter.kt
index a18adbc..9386f99 100644
--- a/app/src/main/java/jp/chau2chaun2/kotlindatabindingsample/presenter/PersonPresenter.kt
+++ b/app/src/main/java/jp/chau2chaun2/kotlindatabindingsample/presenter/PersonPresenter.kt
@@ -15,7 +15,7 @@ class PersonPresenter @Inject constructor(private val personDao: PersonDao) {
             // insert some data
             val persons = ArrayList<Person>().apply {
                 for (i in 0 until 50) {
-                    add(PersonPresenter.createAsDummy)
+                    add(createAsDummy)
                 }
             }
 
diff --git a/app/src/main/java/jp/chau2chaun2/kotlindatabindingsample/view/adapter/BMIListAdapter.kt b/app/src/main/java/jp/chau2chaun2/kotlindatabindingsample/view/adapter/BMIListAdapter.kt
index ce46196..8867184 100644
--- a/app/src/main/java/jp/chau2chaun2/kotlindatabindingsample/view/adapter/BMIListAdapter.kt
+++ b/app/src/main/java/jp/chau2chaun2/kotlindatabindingsample/view/adapter/BMIListAdapter.kt
@@ -17,8 +17,8 @@ class BMIListAdapter(context: Context, private val persons: List<Person>): BaseA
 
     override fun onItemClick(adapter: AdapterView<*>?, view: View?, position: Int, id: Long) {
         view?.let {
-            DataBindingUtil.findBinding<RowListBinding>(it).also {
-                it.task = BMICalculatorTask().apply {
+            DataBindingUtil.findBinding<RowListBinding>(it).also { rowList ->
+                rowList.task = BMICalculatorTask().apply {
                     execute(getItem(position)) }
             }
         }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c3ee1cc..001b62c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -8,7 +8,6 @@
 
     <string name="empty">""</string>
     <string name="format">%.1f</string>
-    <string name="bmi_plus">BMI: %.1f</string>
     <string name="cm">cm</string>
     <string name="kg">kg</string>