diff --git a/app/build.gradle b/app/build.gradle
index 1757d36..4ecfec8 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '0.9.66'
+    ext.kotlin_version = '1.0.0-beta-4584'
 
     repositories {
         mavenCentral()
@@ -7,6 +7,7 @@ buildscript {
     }
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath "org.jetbrains.kotlin:kotlin-android-extensions:$kotlin_version"
     }
 }
 
@@ -14,13 +15,13 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion 21
-    buildToolsVersion "21.1.1"
+    compileSdkVersion 23
+    buildToolsVersion "23.0.2"
 
     defaultConfig {
         applicationId "com.taskworld.android.restfulandroidkotlin"
         minSdkVersion 16
-        targetSdkVersion 21
+        targetSdkVersion 23
         versionCode 1
         versionName "1.0"
     }
@@ -31,7 +32,7 @@ android {
 
     buildTypes {
         release {
-            runProguard false
+            minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
@@ -40,14 +41,19 @@ android {
         exclude 'META-INF/LICENSE.txt'
         exclude 'META-INF/NOTICE.txt'
     }
+
+    lintOptions {
+      abortOnError false
+      checkReleaseBuilds false
+    } 
 }
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
 
     //android support lib
-    compile 'com.android.support:appcompat-v7:21.+'
-    compile 'com.android.support:recyclerview-v7:21.+'
+    compile ('com.android.support:appcompat-v7:+'){force = true}
+    compile ('com.android.support:recyclerview-v7:+'){force = true}
 
     //kotlin support
     compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 940c44f..bb287c9 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -32,7 +32,7 @@
 
         <activity android:name=".view.activity.MovieListActivity"
                   android:theme="@style/Theme.AppCompat.Light.DarkActionBar" />
-        
+
         <activity android:name=".view.activity.MovieDetailActivity"
                   android:theme="@style/AppTheme.AppCompat.Translucent"
                   android:parentActivityName=".view.activity.MainActivity" />
diff --git a/app/src/main/java/com/taskworld/android/restfulandroidkotlin/model/Image.java b/app/src/main/java/com/taskworld/android/restfulandroidkotlin/model/Image.java
index f5d41cd..0925e68 100644
--- a/app/src/main/java/com/taskworld/android/restfulandroidkotlin/model/Image.java
+++ b/app/src/main/java/com/taskworld/android/restfulandroidkotlin/model/Image.java
@@ -32,4 +32,12 @@ public String getFilePath() {
     public int getVoteCount() {
         return voteCount;
     }
+
+    public void setVoteCount(int voteCount) {
+        this.voteCount = voteCount;
+    }
+
+    public void setFilePath(String filePath) {
+        this.filePath = filePath;
+    }
 }
diff --git a/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/action/SignInUIAction.kt b/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/action/SignInUIAction.kt
index 03383ed..e33eb87 100644
--- a/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/action/SignInUIAction.kt
+++ b/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/action/SignInUIAction.kt
@@ -4,7 +4,7 @@ package com.taskworld.android.restfulandroidkotlin.action
  * Created by Kittinun Vantasin on 11/14/14.
  */
 
-trait SignInUIAction {
+interface SignInUIAction {
     fun showProgress()
     fun hideProgress()
     fun setUnauthorizedError()
diff --git a/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/event/BaseEvent.kt b/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/event/BaseEvent.kt
index 87c7ed2..d5f2926 100644
--- a/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/event/BaseEvent.kt
+++ b/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/event/BaseEvent.kt
@@ -1,7 +1,5 @@
 package com.taskworld.android.restfulandroidkotlin.event
 
-import com.taskworld.android.restfulandroidkotlin.extension.tag
-
 /**
  * Created by Kittinun Vantasin on 10/18/14.
  */
diff --git a/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/extension/Activities.kt b/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/extension/Activities.kt
index 955c2f0..ded94be 100644
--- a/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/extension/Activities.kt
+++ b/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/extension/Activities.kt
@@ -8,10 +8,9 @@ import android.widget.Toast
  * Created by Kittinun Vantasin on 10/17/14.
  */
 
-fun <T: View> Activity.bindView(id: Int) : T {
+fun <T : View> Activity.bindView(id: Int): T {
     val view = findViewById(id) ?:
             throw IllegalArgumentException("Given ID $id could not be found in $this!")
-    [suppress("unchecked_cast")]
     return view as T
 }
 
diff --git a/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/extension/Fragments.kt b/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/extension/Fragments.kt
index 78087ee..4e330ef 100644
--- a/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/extension/Fragments.kt
+++ b/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/extension/Fragments.kt
@@ -9,5 +9,5 @@ import android.widget.Toast
 
 fun Fragment.toast(text: String?): Unit {
     if (text == null) return
-    Toast.makeText(getActivity(), text, Toast.LENGTH_LONG).show()
+    Toast.makeText(activity, text, Toast.LENGTH_LONG).show()
 }
diff --git a/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/extension/Generics.kt b/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/extension/Generics.kt
deleted file mode 100644
index 8ae6681..0000000
--- a/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/extension/Generics.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.taskworld.android.restfulandroidkotlin.extension
-
-/**
- * Created by Kittinun Vantasin on 10/18/14.
- */
-
-fun <T> T.tag(): String {
-    return javaClass.getSimpleName()
-}
-
diff --git a/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/extension/Realms.kt b/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/extension/Realms.kt
index 6a330e1..5fd25af 100644
--- a/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/extension/Realms.kt
+++ b/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/extension/Realms.kt
@@ -7,7 +7,7 @@ import io.realm.RealmObject
  * Created by Kittinun Vantasin on 10/20/14.
  */
 
-fun <T: RealmObject> Realm.create(clazz: Class<T>, f: (it: T) -> Unit): T {
+fun <T : RealmObject> Realm.create(clazz: Class<T>, f: (it: T) -> Unit): T {
     beginTransaction()
     var realmObject = createObject(clazz)
     f(realmObject)
@@ -15,7 +15,7 @@ fun <T: RealmObject> Realm.create(clazz: Class<T>, f: (it: T) -> Unit): T {
     return realmObject
 }
 
-fun <T: RealmObject> Realm.update(clazz: Class<T>, key: String, value: String, f: (it: T, change: MutableMap<String, String>) -> Unit): UpdateResult<T> {
+fun <T : RealmObject> Realm.update(clazz: Class<T>, key: String, value: String, f: (it: T, change: MutableMap<String, String>) -> Unit): UpdateResult<T> {
     beginTransaction()
     var realmObject = where(clazz).equalTo(key, value).findFirst()
     var changeMap: MutableMap<String, String> = hashMapOf()
@@ -24,18 +24,18 @@ fun <T: RealmObject> Realm.update(clazz: Class<T>, key: String, value: String, f
     return UpdateResult(realmObject, changeMap)
 }
 
-fun <T: RealmObject> Realm.deleteAll(clazz: Class<T>) {
+fun <T : RealmObject> Realm.deleteAll(clazz: Class<T>) {
     beginTransaction()
     var results = where(clazz).findAll()
     results.clear()
     commitTransaction()
 }
 
-fun <T: RealmObject> Realm.delete(clazz: Class<T>, key: String, value: String) {
+fun <T : RealmObject> Realm.delete(clazz: Class<T>, key: String, value: String) {
     beginTransaction()
     var results = where(clazz).equalTo(key, value).findAll()
     results.clear()
     commitTransaction()
 }
 
-data class UpdateResult<T: RealmObject>(val result: T, val changeMap: Map<String, String>)
+data class UpdateResult<T : RealmObject>(val result: T, val changeMap: Map<String, String>)
diff --git a/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/extension/Strings.kt b/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/extension/Strings.kt
index 0409a0d..e777d8f 100644
--- a/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/extension/Strings.kt
+++ b/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/extension/Strings.kt
@@ -7,7 +7,7 @@ package com.taskworld.android.restfulandroidkotlin.extension
 fun String.toStartingLetterUppercase(): String {
     if (this.isEmpty()) return this
 
-    var firstChar = this.charAt(0)
+    var firstChar = this.get(0)
     val valueOfFirstChar = firstChar.toInt()
 
     if (valueOfFirstChar in 97..122) {
diff --git a/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/extension/Views.kt b/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/extension/Views.kt
index 43fc19b..69f13f5 100644
--- a/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/extension/Views.kt
+++ b/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/extension/Views.kt
@@ -6,9 +6,8 @@ import android.view.View
  * Created by Kittinun Vantasin on 10/18/14.
  */
 
-fun <T: View> View.bindView(id: Int): T {
+fun <T : View> View.bindView(id: Int): T {
     val view = findViewById(id) ?:
             throw IllegalArgumentException("Given ID $id could not be found in $this!")
-    [suppress("unchecked_cast")]
     return view as T
 }
diff --git a/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/interactor/SignInInteractor.kt b/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/interactor/SignInInteractor.kt
index c3216f5..c329156 100644
--- a/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/interactor/SignInInteractor.kt
+++ b/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/interactor/SignInInteractor.kt
@@ -1,17 +1,17 @@
 package com.taskworld.android.restfulandroidkotlin.interactor
 
 import com.octo.android.robospice.SpiceManager
+import com.taskworld.android.restfulandroidkotlin.network.request.GetNewSessionSpiceRequest
 import com.taskworld.android.restfulandroidkotlin.network.request.GetTokenSpiceRequest
-import com.taskworld.android.restfulandroidkotlin.network.response.EventBusRequestListener
 import com.taskworld.android.restfulandroidkotlin.network.request.ValidateTokenSpiceRequest
-import com.taskworld.android.restfulandroidkotlin.network.request.GetNewSessionSpiceRequest
+import com.taskworld.android.restfulandroidkotlin.network.response.EventBusRequestListener
 import de.greenrobot.event.EventBus
 
 /**
  * Created by Kittinun Vantasin on 11/14/14.
  */
 
-trait SignInInteractor {
+interface SignInInteractor {
     fun requestNewToken()
     fun requestNewSession(requestToken: String)
     fun validateCredentials(username: String, password: String, requestToken: String)
diff --git a/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/network/api/TheMovieDBAPI.kt b/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/network/api/TheMovieDBAPI.kt
index 2114c36..1e0db17 100644
--- a/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/network/api/TheMovieDBAPI.kt
+++ b/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/network/api/TheMovieDBAPI.kt
@@ -1,64 +1,60 @@
 package com.taskworld.android.restfulandroidkotlin.network.api
 
-import retrofit.http.GET
-import retrofit.http.Query
-import com.taskworld.android.restfulandroidkotlin.model.Movie
-import retrofit.http.POST
-import retrofit.http.Body
-import retrofit.http.EncodedPath
-import com.taskworld.android.restfulandroidkotlin.model.TV
 import com.taskworld.android.restfulandroidkotlin.model.Cast
 import com.taskworld.android.restfulandroidkotlin.model.Image
+import com.taskworld.android.restfulandroidkotlin.model.Movie
+import com.taskworld.android.restfulandroidkotlin.model.TV
+import retrofit.http.*
 
 /**
  * Created by Kittinun Vantasin on 10/24/14.
  */
 
-trait TheMovieDBAPI {
+interface TheMovieDBAPI {
 
-    trait MovieAPI {
-        GET("/{path}")
-        fun get(EncodedPath("path") path: String): Movie
+    interface MovieAPI {
+        @GET("/{path}")
+        fun get(@EncodedPath("path") path: String): Movie
 
-        GET("/{path}/now_playing")
-        fun getNowPlayingList(EncodedPath("path") path: String): Movie.ResultList
+        @GET("/{path}/now_playing")
+        fun getNowPlayingList(@EncodedPath("path") path: String): Movie.ResultList
 
-        GET("/{path}/top_rated")
-        fun getTopRatedList(EncodedPath("path") path: String): Movie.ResultList
+        @GET("/{path}/top_rated")
+        fun getTopRatedList(@EncodedPath("path") path: String): Movie.ResultList
 
-        GET("/{path}/credits")
-        fun getCastList(EncodedPath("path") path: String): Cast.CastList
+        @GET("/{path}/credits")
+        fun getCastList(@EncodedPath("path") path: String): Cast.CastList
 
-        GET("/{path}/images")
-        fun getPosterImageList(EncodedPath("path") path: String): Image.PosterList
+        @GET("/{path}/images")
+        fun getPosterImageList(@EncodedPath("path") path: String): Image.PosterList
 
-        POST("/{path}")
-        fun post(EncodedPath("path") path: String, Body movie: Movie)
+        @POST("/{path}")
+        fun post(@EncodedPath("path") path: String, @Body movie: Movie)
     }
 
-    trait Authentication {
-        GET("/authentication/token/new")
+    interface Authentication {
+        @GET("/authentication/token/new")
         fun getRequestToken(): Map<String, String>
 
-        GET("/authentication/token/validate_with_login")
-        fun validateToken(Query("username") username: String, Query("password") password: String, Query("request_token") token: String): Map<String, String>
+        @GET("/authentication/token/validate_with_login")
+        fun validateToken(@Query("username") username: String, @Query("password") password: String, @Query("request_token") token: String): Map<String, String>
 
-        GET("/authentication/session/new")
-        fun getNewSession(Query("request_token") token: String): Map<String, String>
+        @GET("/authentication/session/new")
+        fun getNewSession(@Query("request_token") token: String): Map<String, String>
     }
 
-    trait TVAPI {
-        GET("/{path}")
-        fun get(EncodedPath("path") path: String): TV
+    interface TVAPI {
+        @GET("/{path}")
+        fun get(@EncodedPath("path") path: String): TV
 
-        GET("/{path}/airing_today")
-        fun getAiringTodayList(EncodedPath("path") path: String): TV.ResultList
+        @GET("/{path}/airing_today")
+        fun getAiringTodayList(@EncodedPath("path") path: String): TV.ResultList
 
-        GET("/{path}/popular")
-        fun getPopularList(EncodedPath("path") path: String): TV.ResultList
+        @GET("/{path}/popular")
+        fun getPopularList(@EncodedPath("path") path: String): TV.ResultList
 
-        POST("/{path}")
-        fun post(EncodedPath("path") path: String, Body TV: TV)
+        @POST("/{path}")
+        fun post(@EncodedPath("path") path: String, @Body TV: TV)
     }
 }
 
diff --git a/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/network/request/GetListMovieNowplayingSpiceRequest.kt b/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/network/request/GetListMovieNowplayingSpiceRequest.kt
index 1646193..8d8f9c5 100644
--- a/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/network/request/GetListMovieNowplayingSpiceRequest.kt
+++ b/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/network/request/GetListMovieNowplayingSpiceRequest.kt
@@ -9,9 +9,9 @@ import com.taskworld.android.restfulandroidkotlin.network.api.TheMovieDBAPI
  */
 
 class GetListMovieNowplayingSpiceRequest(val path: String) :
-        RetrofitSpiceRequest<Movie.ResultList, TheMovieDBAPI.MovieAPI>(javaClass<Movie.ResultList>(), javaClass<TheMovieDBAPI.MovieAPI>()) {
+        RetrofitSpiceRequest<Movie.ResultList, TheMovieDBAPI.MovieAPI>(Movie.ResultList::class.java, TheMovieDBAPI.MovieAPI::class.java) {
 
     override fun loadDataFromNetwork(): Movie.ResultList? {
-        return getService().getNowPlayingList(path)
+        return service.getNowPlayingList(path)
     }
 }
diff --git a/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/network/request/GetListMovieTopratedSpiceRequest.kt b/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/network/request/GetListMovieTopratedSpiceRequest.kt
index 2987724..d24d2f4 100644
--- a/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/network/request/GetListMovieTopratedSpiceRequest.kt
+++ b/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/network/request/GetListMovieTopratedSpiceRequest.kt
@@ -9,9 +9,9 @@ import com.taskworld.android.restfulandroidkotlin.network.api.TheMovieDBAPI
  */
 
 class GetListMovieTopratedSpiceRequest(val path: String) :
-        RetrofitSpiceRequest<Movie.ResultList, TheMovieDBAPI.MovieAPI>(javaClass<Movie.ResultList>(), javaClass<TheMovieDBAPI.MovieAPI>()) {
+        RetrofitSpiceRequest<Movie.ResultList, TheMovieDBAPI.MovieAPI>(Movie.ResultList::class.java, TheMovieDBAPI.MovieAPI::class.java) {
 
     override fun loadDataFromNetwork(): Movie.ResultList? {
-        return getService().getTopRatedList(path)
+        return service.getTopRatedList(path)
     }
 }
diff --git a/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/network/request/GetListTVAiringtodaySpiceRequest.kt b/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/network/request/GetListTVAiringtodaySpiceRequest.kt
index ee1b62d..88d102f 100644
--- a/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/network/request/GetListTVAiringtodaySpiceRequest.kt
+++ b/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/network/request/GetListTVAiringtodaySpiceRequest.kt
@@ -9,10 +9,10 @@ import com.taskworld.android.restfulandroidkotlin.network.api.TheMovieDBAPI
  */
 
 class GetListTVAiringtodaySpiceRequest(val path: String) :
-        RetrofitSpiceRequest<TV.ResultList, TheMovieDBAPI.TVAPI>(javaClass<TV.ResultList>(), javaClass<TheMovieDBAPI.TVAPI>()) {
+        RetrofitSpiceRequest<TV.ResultList, TheMovieDBAPI.TVAPI>(TV.ResultList::class.java, TheMovieDBAPI.TVAPI::class.java) {
 
     override fun loadDataFromNetwork(): TV.ResultList? {
-        return getService().getAiringTodayList(path)
+        return service.getAiringTodayList(path)
     }
 
 }
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/network/request/GetListTVPopularSpiceRequest.kt b/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/network/request/GetListTVPopularSpiceRequest.kt
index 2f5b5f5..1ee748e 100644
--- a/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/network/request/GetListTVPopularSpiceRequest.kt
+++ b/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/network/request/GetListTVPopularSpiceRequest.kt
@@ -9,10 +9,10 @@ import com.taskworld.android.restfulandroidkotlin.network.api.TheMovieDBAPI
  */
 
 class GetListTVPopularSpiceRequest(val path: String) :
-        RetrofitSpiceRequest<TV.ResultList, TheMovieDBAPI.TVAPI>(javaClass<TV.ResultList>(), javaClass<TheMovieDBAPI.TVAPI>()) {
+        RetrofitSpiceRequest<TV.ResultList, TheMovieDBAPI.TVAPI>(TV.ResultList::class.java, TheMovieDBAPI.TVAPI::class.java) {
 
     override fun loadDataFromNetwork(): TV.ResultList? {
-        return getService().getPopularList(path)
+        return service.getPopularList(path)
     }
 
 }
diff --git a/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/network/request/GetMovieCreditsSpiceRequest.kt b/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/network/request/GetMovieCreditsSpiceRequest.kt
index 9b33046..a3ff739 100644
--- a/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/network/request/GetMovieCreditsSpiceRequest.kt
+++ b/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/network/request/GetMovieCreditsSpiceRequest.kt
@@ -9,9 +9,9 @@ import com.taskworld.android.restfulandroidkotlin.network.api.TheMovieDBAPI
  */
 
 class GetMovieCreditsSpiceRequest(val path: String) :
-        RetrofitSpiceRequest<Cast.CastList, TheMovieDBAPI.MovieAPI>(javaClass<Cast.CastList>(), javaClass<TheMovieDBAPI.MovieAPI>()) {
+        RetrofitSpiceRequest<Cast.CastList, TheMovieDBAPI.MovieAPI>(Cast.CastList::class.java, TheMovieDBAPI.MovieAPI::class.java) {
 
     override fun loadDataFromNetwork(): Cast.CastList? {
-        return getService().getCastList(path)
+        return service.getCastList(path)
     }
 }
diff --git a/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/network/request/GetMovieImagesSpiceRequest.kt b/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/network/request/GetMovieImagesSpiceRequest.kt
index 9077067..5b3a19f 100644
--- a/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/network/request/GetMovieImagesSpiceRequest.kt
+++ b/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/network/request/GetMovieImagesSpiceRequest.kt
@@ -9,10 +9,10 @@ import com.taskworld.android.restfulandroidkotlin.network.api.TheMovieDBAPI
  */
 
 class GetMovieImagesSpiceRequest(val path: String) :
-        RetrofitSpiceRequest<Image.PosterList, TheMovieDBAPI.MovieAPI>(javaClass<Image.PosterList>(), javaClass<TheMovieDBAPI.MovieAPI>()) {
+        RetrofitSpiceRequest<Image.PosterList, TheMovieDBAPI.MovieAPI>(Image.PosterList::class.java, TheMovieDBAPI.MovieAPI::class.java) {
 
     override fun loadDataFromNetwork(): Image.PosterList? {
-        return getService().getPosterImageList(path)
+        return service.getPosterImageList(path)
     }
 
 }
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/network/request/GetMovieSpiceRequest.kt b/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/network/request/GetMovieSpiceRequest.kt
index b7691bf..a0265da 100644
--- a/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/network/request/GetMovieSpiceRequest.kt
+++ b/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/network/request/GetMovieSpiceRequest.kt
@@ -1,18 +1,18 @@
 package com.taskworld.android.restfulandroidkotlin.network.request
 
-import com.taskworld.android.restfulandroidkotlin.network.api.TheMovieDBAPI
-import com.taskworld.android.restfulandroidkotlin.model.Movie
 import com.octo.android.robospice.request.retrofit.RetrofitSpiceRequest
+import com.taskworld.android.restfulandroidkotlin.model.Movie
+import com.taskworld.android.restfulandroidkotlin.network.api.TheMovieDBAPI
 
 /**
  * Created by Kittinun Vantasin on 10/29/14.
  */
 
 class GetMovieSpiceRequest(val path: String) :
-        RetrofitSpiceRequest<Movie, TheMovieDBAPI.MovieAPI>(javaClass<Movie>(), javaClass<TheMovieDBAPI.MovieAPI>()) {
+        RetrofitSpiceRequest<Movie, TheMovieDBAPI.MovieAPI>(Movie::class.java, TheMovieDBAPI.MovieAPI::class.java) {
 
     override fun loadDataFromNetwork(): Movie? {
-        return getService().get(path)
+        return service.get(path)
     }
 
 }
diff --git a/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/network/request/GetNewSessionSpiceRequest.kt b/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/network/request/GetNewSessionSpiceRequest.kt
index b392db1..c3c65a8 100644
--- a/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/network/request/GetNewSessionSpiceRequest.kt
+++ b/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/network/request/GetNewSessionSpiceRequest.kt
@@ -1,6 +1,5 @@
 package com.taskworld.android.restfulandroidkotlin.network.request
 
-import com.octo.android.robospice.retrofit.RetrofitGsonSpiceService
 import com.octo.android.robospice.request.retrofit.RetrofitSpiceRequest
 import com.taskworld.android.restfulandroidkotlin.network.api.TheMovieDBAPI
 
@@ -8,10 +7,10 @@ import com.taskworld.android.restfulandroidkotlin.network.api.TheMovieDBAPI
  * Created by VerachadW on 11/4/14.
  */
 class GetNewSessionSpiceRequest(val token: String) :
-        RetrofitSpiceRequest<Map<String, String>, TheMovieDBAPI.Authentication>(javaClass<Map<String, String>>(), javaClass<TheMovieDBAPI.Authentication>()) {
+        RetrofitSpiceRequest<Map<*, *>, TheMovieDBAPI.Authentication>(Map::class.java, TheMovieDBAPI.Authentication::class.java) {
 
     override fun loadDataFromNetwork(): Map<String, String>? {
-        return getService().getNewSession(token)
+        return service.getNewSession(token)
     }
 
 }
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/network/request/GetTokenSpiceRequest.kt b/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/network/request/GetTokenSpiceRequest.kt
index 6675e78..2d70a3b 100644
--- a/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/network/request/GetTokenSpiceRequest.kt
+++ b/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/network/request/GetTokenSpiceRequest.kt
@@ -1,6 +1,5 @@
 package com.taskworld.android.restfulandroidkotlin.network.request
 
-import com.octo.android.robospice.retrofit.RetrofitGsonSpiceService
 import com.octo.android.robospice.request.retrofit.RetrofitSpiceRequest
 import com.taskworld.android.restfulandroidkotlin.network.api.TheMovieDBAPI
 
@@ -8,10 +7,10 @@ import com.taskworld.android.restfulandroidkotlin.network.api.TheMovieDBAPI
  * Created by VerachadW on 11/4/14.
  */
 class GetTokenSpiceRequest :
-        RetrofitSpiceRequest<Map<String, String>, TheMovieDBAPI.Authentication>(javaClass<Map<String, String>>(), javaClass<TheMovieDBAPI.Authentication>()) {
+        RetrofitSpiceRequest<Map<*, *>, TheMovieDBAPI.Authentication>(Map::class.java, TheMovieDBAPI.Authentication::class.java) {
 
     override fun loadDataFromNetwork(): Map<String, String>? {
-        return getService().getRequestToken()
+        return service.getRequestToken()
     }
 
 }
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/network/request/ValidateTokenSpiceRequest.kt b/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/network/request/ValidateTokenSpiceRequest.kt
index b261e40..023c785 100644
--- a/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/network/request/ValidateTokenSpiceRequest.kt
+++ b/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/network/request/ValidateTokenSpiceRequest.kt
@@ -1,18 +1,17 @@
 package com.taskworld.android.restfulandroidkotlin.network.request
 
-import com.octo.android.robospice.retrofit.RetrofitGsonSpiceService
 import com.octo.android.robospice.request.retrofit.RetrofitSpiceRequest
 import com.taskworld.android.restfulandroidkotlin.network.api.TheMovieDBAPI
 
 /**
  * Created by VerachadW on 11/4/14.
  */
-class ValidateTokenSpiceRequest (val username: String, val password: String, val token: String) :
-        RetrofitSpiceRequest<Map<String, String>, TheMovieDBAPI.Authentication>(javaClass<Map<String, String>>(), javaClass<TheMovieDBAPI.Authentication>()) {
+class ValidateTokenSpiceRequest(val username: String, val password: String, val token: String) :
+        RetrofitSpiceRequest<Map<*, *>, TheMovieDBAPI.Authentication>(Map::class.java, TheMovieDBAPI.Authentication::class.java) {
 
 
     override fun loadDataFromNetwork(): Map<String, String>? {
-        return getService().validateToken(username, password, token)
+        return service.validateToken(username, password, token)
     }
 
 }
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/network/response/EventBusRequestListener.kt b/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/network/response/EventBusRequestListener.kt
index 04bb058..ad2363f 100644
--- a/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/network/response/EventBusRequestListener.kt
+++ b/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/network/response/EventBusRequestListener.kt
@@ -1,21 +1,21 @@
 package com.taskworld.android.restfulandroidkotlin.network.response
 
-import com.octo.android.robospice.request.listener.RequestListener
 import com.octo.android.robospice.persistence.exception.SpiceException
+import com.octo.android.robospice.request.listener.RequestListener
 import de.greenrobot.event.EventBus
 
 /**
  * Created by Kittinun Vantasin on 10/24/14.
  */
 
-class EventBusRequestListener<T> private (val bus: EventBus) : RequestListener<T> {
+class EventBusRequestListener<T>(val bus: EventBus) : RequestListener<T> {
 
-    class object {
-        fun newInstance<T>(): EventBusRequestListener<T> {
+    companion object {
+        fun <T> newInstance(): EventBusRequestListener<T> {
             return EventBusRequestListener(EventBus.getDefault())
         }
 
-        fun newInstance<T>(bus: EventBus): EventBusRequestListener<T> {
+        fun <T> newInstance(bus: EventBus): EventBusRequestListener<T> {
             return EventBusRequestListener(bus)
         }
     }
diff --git a/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/network/service/TheMovieAPISpiceService.kt b/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/network/service/TheMovieAPISpiceService.kt
index ef82062..9fbef22 100644
--- a/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/network/service/TheMovieAPISpiceService.kt
+++ b/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/network/service/TheMovieAPISpiceService.kt
@@ -1,15 +1,15 @@
 package com.taskworld.android.restfulandroidkotlin.network.service
 
+import com.google.gson.GsonBuilder
 import com.octo.android.robospice.retrofit.RetrofitGsonSpiceService
-import retrofit.RestAdapter
 import com.taskworld.android.restfulandroidkotlin.network.api.TheMovieDBAPI
+import retrofit.RestAdapter
 import retrofit.converter.Converter
 import retrofit.converter.GsonConverter
-import com.google.gson.GsonBuilder
 
 class TheMovieAPISpiceService : RetrofitGsonSpiceService() {
 
-    class object {
+    companion object {
 
         val BASE_URL = "http://api.themoviedb.org/3"
 
@@ -24,13 +24,13 @@ class TheMovieAPISpiceService : RetrofitGsonSpiceService() {
     override fun createRestAdapterBuilder(): RestAdapter.Builder? {
         var builder = super<RetrofitGsonSpiceService>.createRestAdapterBuilder()
         builder.setRequestInterceptor { requestInterceptor -> requestInterceptor.addQueryParam(API_KEY, API_VALUE) }
-            .setLogLevel(RestAdapter.LogLevel.FULL)
+                .setLogLevel(RestAdapter.LogLevel.FULL)
         return builder
     }
 
     override fun onCreate() {
         super<RetrofitGsonSpiceService>.onCreate()
-        addRetrofitInterface(javaClass<TheMovieDBAPI>())
+        addRetrofitInterface(TheMovieDBAPI::class.java)
     }
 
     override fun createConverter(): Converter? {
diff --git a/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/presenter/Presenter.kt b/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/presenter/Presenter.kt
index 96e9066..3623ea3 100644
--- a/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/presenter/Presenter.kt
+++ b/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/presenter/Presenter.kt
@@ -4,13 +4,11 @@ package com.taskworld.android.restfulandroidkotlin.presenter
  * Created by Kittinun Vantasin on 11/17/14.
  */
 
-trait Presenter {
+interface Presenter {
 
     fun onResume() {
-
     }
 
     fun onPause() {
-
     }
 }
diff --git a/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/presenter/SignInPresenter.kt b/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/presenter/SignInPresenter.kt
index 53e8ddb..9e976f1 100644
--- a/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/presenter/SignInPresenter.kt
+++ b/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/presenter/SignInPresenter.kt
@@ -1,19 +1,19 @@
 package com.taskworld.android.restfulandroidkotlin.presenter
 
-import com.taskworld.android.restfulandroidkotlin.action.SignInUIAction
 import com.octo.android.robospice.SpiceManager
-import com.taskworld.android.restfulandroidkotlin.interactor.SignInInteractorImpl
+import com.octo.android.robospice.persistence.exception.SpiceException
+import com.taskworld.android.restfulandroidkotlin.action.SignInUIAction
 import com.taskworld.android.restfulandroidkotlin.interactor.SignInInteractor
+import com.taskworld.android.restfulandroidkotlin.interactor.SignInInteractorImpl
 import de.greenrobot.event.EventBus
-import com.octo.android.robospice.persistence.exception.SpiceException
-import kotlin.properties.Delegates
 import retrofit.RetrofitError
+import kotlin.properties.Delegates
 
 /**
  * Created by Kittinun Vantasin on 11/14/14.
  */
 
-trait SignInPresenter : Presenter {
+interface SignInPresenter : Presenter {
     fun logInWithCredentials(username: String, password: String)
 }
 
@@ -24,7 +24,7 @@ class SignInPresenterImpl(val mAction: SignInUIAction, val mSpiceManager: SpiceM
 
     var mInteractor: SignInInteractor
 
-    {
+    init {
         mInteractor = SignInInteractorImpl(mSpiceManager, mBus)
     }
 
@@ -66,7 +66,7 @@ class SignInPresenterImpl(val mAction: SignInUIAction, val mSpiceManager: SpiceM
     fun onEvent(spiceException: SpiceException?) {
         mAction.hideProgress()
 
-        val error = spiceException?.getCause() as RetrofitError
+        val error = spiceException?.cause as RetrofitError
         if (error.getResponse().getStatus() == 401) {
             mAction.setUnauthorizedError()
         } else if (error.isNetworkError()) {
diff --git a/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/resource/client/ResourceClient.kt b/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/resource/client/ResourceClient.kt
index 3a29f5f..73cb83b 100644
--- a/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/resource/client/ResourceClient.kt
+++ b/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/resource/client/ResourceClient.kt
@@ -1,16 +1,16 @@
 package com.taskworld.android.restfulandroidkotlin.resource.client
 
 import com.octo.android.robospice.SpiceManager
+import com.octo.android.robospice.request.SpiceRequest
+import com.taskworld.android.restfulandroidkotlin.extension.toStartingLetterUppercase
+import com.taskworld.android.restfulandroidkotlin.network.response.EventBusRequestListener
 import com.taskworld.android.restfulandroidkotlin.resource.router.ResourceRouter
+import com.taskworld.android.restfulandroidkotlin.resource.router.ResourceRouterImpl
+import de.greenrobot.event.EventBus
 import io.realm.Realm
 import io.realm.RealmObject
-import de.greenrobot.event.EventBus
-import com.taskworld.android.restfulandroidkotlin.network.response.EventBusRequestListener
-import com.taskworld.android.restfulandroidkotlin.extension.toStartingLetterUppercase
-import com.octo.android.robospice.request.SpiceRequest
-import io.realm.RealmResults
 import io.realm.RealmQuery
-import com.taskworld.android.restfulandroidkotlin.resource.router.ResourceRouterImpl
+import io.realm.RealmResults
 
 class ResourceClient(builder: ResourceClient.Builder) {
 
@@ -20,47 +20,47 @@ class ResourceClient(builder: ResourceClient.Builder) {
     private var mBus: EventBus
 
     //initialize
-    {
+    init {
         mSpiceManager = builder.manager
         mResourceRouter = builder.router ?: ResourceRouterImpl.newInstance()
         mRealm = builder.realm
         mBus = builder.bus ?: EventBus.getDefault()
     }
 
-    class object {
+    companion object {
         private val REQUEST_PACKAGE = "com.taskworld.android.restfulandroidkotlin.network.request"
         private val REQUEST_CLASS_SUFFIX = "SpiceRequest"
+    }
 
-        inner class Builder {
+    class Builder {
 
-            var manager: SpiceManager? = null
-            var router: ResourceRouter? = null
-            var realm: Realm? = null
-            var bus: EventBus? = null
+        var manager: SpiceManager? = null
+        var router: ResourceRouter? = null
+        var realm: Realm? = null
+        var bus: EventBus? = null
 
-            fun setSpiceManager(manager: SpiceManager): Builder {
-                this.manager = manager
-                return this
-            }
+        fun setSpiceManager(manager: SpiceManager): Builder {
+            this.manager = manager
+            return this
+        }
 
-            fun setRouter(router: ResourceRouter): Builder {
-                this.router = router
-                return this
-            }
+        fun setRouter(router: ResourceRouter): Builder {
+            this.router = router
+            return this
+        }
 
-            fun setRealm(realm: Realm): Builder {
-                this.realm = realm
-                return this
-            }
+        fun setRealm(realm: Realm): Builder {
+            this.realm = realm
+            return this
+        }
 
-            fun setEventBus(bus: EventBus): Builder {
-                this.bus = bus
-                return this
-            }
+        fun setEventBus(bus: EventBus): Builder {
+            this.bus = bus
+            return this
+        }
 
-            fun build(): ResourceClient {
-                return ResourceClient(this)
-            }
+        fun build(): ResourceClient {
+            return ResourceClient(this)
         }
     }
 
@@ -86,7 +86,7 @@ class ResourceClient(builder: ResourceClient.Builder) {
         // TODO: Call Update API
     }
 
-    fun <T: RealmObject> delete(clazz: Class<T>, conditionMap: Map<String, String>?) {
+    fun <T : RealmObject> delete(clazz: Class<T>, conditionMap: Map<String, String>?) {
         mRealm!!.beginTransaction()
         var results = query(clazz, conditionMap)
 
@@ -100,7 +100,7 @@ class ResourceClient(builder: ResourceClient.Builder) {
         // TODO: Call Delete API
     }
 
-    private fun <T : RealmObject> query(clazz: Class<T>, conditionMap: Map<String, String>?): RealmResults<T>{
+    private fun <T : RealmObject> query(clazz: Class<T>, conditionMap: Map<String, String>?): RealmResults<T> {
         var query: RealmQuery<T> = mRealm!!.where(clazz)
         if (conditionMap != null) {
             for ((key, value) in conditionMap) {
@@ -114,11 +114,11 @@ class ResourceClient(builder: ResourceClient.Builder) {
         return results
     }
 
-    fun <T: RealmObject> findAll(clazz: Class<T>) {
+    fun <T : RealmObject> findAll(clazz: Class<T>) {
         findAll(clazz, null)
     }
 
-    fun <T: RealmObject> findAll(clazz: Class<T>, args: Map<String, String>?) {
+    fun <T : RealmObject> findAll(clazz: Class<T>, args: Map<String, String>?) {
         //db call
         val results = query(clazz, args)
         EventBus.getDefault().post(results)
@@ -163,14 +163,12 @@ class ResourceClient(builder: ResourceClient.Builder) {
             "list" -> extraPath = mResourceRouter.extraPathForList ?: ""
         }
 
-        val className = listOf(httpVerb.toStartingLetterUppercase(),
-                action.toStartingLetterUppercase(),
-                resourceName.toStartingLetterUppercase(),
-                extraPath.replace("_", "").toStartingLetterUppercase(),
-                REQUEST_CLASS_SUFFIX).join("")
-        val constructorOfClassName = Class.forName(REQUEST_PACKAGE + "." + className).getConstructor(javaClass<String>())
+        val className = httpVerb.toStartingLetterUppercase() +
+                action.toStartingLetterUppercase() +
+                resourceName.toStartingLetterUppercase() +
+                extraPath.replace("_", "").toStartingLetterUppercase() + REQUEST_CLASS_SUFFIX
+        val constructorOfClassName = Class.forName(REQUEST_PACKAGE + "." + className).getConstructor(String::class.java)
 
-        [suppress("unchecked_cast")]
         val requestInstance = constructorOfClassName.newInstance(requestPath) as SpiceRequest<T>
         mSpiceManager?.execute(requestInstance, EventBusRequestListener.newInstance(mBus))
     }
diff --git a/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/resource/router/ResourceRouter.kt b/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/resource/router/ResourceRouter.kt
index 21108f3..5971840 100644
--- a/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/resource/router/ResourceRouter.kt
+++ b/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/resource/router/ResourceRouter.kt
@@ -1,13 +1,12 @@
 package com.taskworld.android.restfulandroidkotlin.resource.router
 
 import io.realm.RealmObject
-import com.taskworld.android.restfulandroidkotlin.extension.plus
 
 /**
  * Created by Kittinun Vantasin on 10/28/14.
  */
 
-trait ResourceRouter {
+interface ResourceRouter {
 
     val extraPathForList: String?
     val extraPathForSingle: String?
@@ -17,7 +16,7 @@ trait ResourceRouter {
     }
 
     fun <T : RealmObject> getPathForAction(action: String, clazz: Class<T>, args: Map<String, Any>?): String? {
-        if (action.equalsIgnoreCase("list")) {
+        if (action.equals("list")) {
             return getPathForListOnResource(clazz, args)
         } else if (action.isEmpty()) {
             return getPathForSingleOnResource(clazz, args)
@@ -29,9 +28,9 @@ trait ResourceRouter {
     fun <T : RealmObject> getPathForSingleOnResource(clazz: Class<T>, args: Map<String, Any>?): String
 }
 
-class ResourceRouterImpl private (override val extraPathForList: String?, override val extraPathForSingle: String?) : ResourceRouter {
+class ResourceRouterImpl(override val extraPathForList: String?, override val extraPathForSingle: String?) : ResourceRouter {
 
-    class object {
+    companion object {
         fun newInstance() = ResourceRouterImpl(null, null)
         fun newInstance(extraPath: String?) = ResourceRouterImpl(extraPath, null)
         fun newInstance(extraPathForList: String?, extraPathForSingle: String?) = ResourceRouterImpl(extraPathForList, extraPathForSingle)
@@ -47,6 +46,6 @@ class ResourceRouterImpl private (override val extraPathForList: String?, overri
 
         val builder = StringBuilder(clazz.getSimpleName().toLowerCase())
 
-        return (builder + "/" + idValue.toString()).toString()
+        return (builder.toString() + "/" + idValue.toString()).toString()
     }
 }
diff --git a/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/util/CircularTransformation.kt b/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/util/CircularTransformation.kt
index fac716d..061a1e3 100644
--- a/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/util/CircularTransformation.kt
+++ b/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/util/CircularTransformation.kt
@@ -1,13 +1,8 @@
 package com.taskworld.android.restfulandroidkotlin.util
 
-import com.squareup.picasso.Transformation
-import android.graphics.Bitmap
-import com.taskworld.android.restfulandroidkotlin.extension.tag
-import android.graphics.Canvas
+import android.graphics.*
 import android.graphics.Bitmap.Config
-import android.graphics.Shader
-import android.graphics.BitmapShader
-import android.graphics.Paint
+import com.squareup.picasso.Transformation
 
 /**
  * Created by Kittinun Vantasin on 11/18/14.
@@ -33,6 +28,6 @@ class CircularTransformation : Transformation {
     }
 
     override fun key(): String? {
-        return tag()
+        return ""
     }
 }
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/util/Preference.kt b/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/util/Preference.kt
index bdab166..9fb0cb2 100644
--- a/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/util/Preference.kt
+++ b/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/util/Preference.kt
@@ -1,15 +1,15 @@
 package com.taskworld.android.restfulandroidkotlin.util
 
-import kotlin.properties.Delegates
-import android.content.SharedPreferences
 import android.content.Context
+import android.content.SharedPreferences
 import kotlin.properties.ReadWriteProperty
+import kotlin.reflect.KProperty
 
 object Preference {
 
     private val NAME = "movie"
 
-    private var mSharedPreferences: SharedPreferences?  = null
+    private var mSharedPreferences: SharedPreferences? = null
 
     //
     var username: String? by PreferenceDelegate()
@@ -20,36 +20,35 @@ object Preference {
         return this
     }
 
-    inner class PreferenceDelegate<T>() : ReadWriteProperty<Any?, T> {
-        private var value: T = null
+    class PreferenceDelegate<T>() : ReadWriteProperty<Any?, T> {
+        private var value = "" as T
 
-        override fun get(thisRef: Any?, desc: PropertyMetadata): T {
+        override fun getValue(thisRef: Any?, property: KProperty<*>): T {
 
             if (mSharedPreferences == null) throw NullPointerException("Preference.with() must be called before acessing properties")
 
-            [suppress("unchecked_cast")]
             when (value) {
-                is String -> value = mSharedPreferences!!.getString(desc.name, null) as T
-                is Float -> value = mSharedPreferences!!.getFloat(desc.name, 0.0f) as T
-                is Int -> value = mSharedPreferences!!.getInt(desc.name, 0) as T
-                is Boolean -> value = mSharedPreferences!!.getBoolean(desc.name, false) as T
-                is Long -> value = mSharedPreferences!!.getLong(desc.name, 0L) as T
-                else -> throw IllegalArgumentException("${desc.name} variable type is not supported yet!!")
+                is String -> value = mSharedPreferences!!.getString(property.name, null) as T
+                is Float -> value = mSharedPreferences!!.getFloat(property.name, 0.0f) as T
+                is Int -> value = mSharedPreferences!!.getInt(property.name, 0) as T
+                is Boolean -> value = mSharedPreferences!!.getBoolean(property.name, false) as T
+                is Long -> value = mSharedPreferences!!.getLong(property.name, 0L) as T
+                else -> throw IllegalArgumentException("${property.name} variable type is not supported yet!!")
             }
             return value
         }
 
-        override fun set(thisRef: Any?, desc: PropertyMetadata, value: T) {
+        override fun setValue(thisRef: Any?, property: KProperty<*>, value: T) {
 
             if (mSharedPreferences == null) throw NullPointerException("Preference.with() must be called before acessing properties")
 
             val editor = mSharedPreferences!!.edit()
             when (value) {
-                is String -> editor.putString(desc.name, value)
-                is Float -> editor.putFloat(desc.name, value)
-                is Int -> editor.putInt(desc.name, value)
-                is Boolean -> editor.putBoolean(desc.name, value)
-                is Long -> editor.putLong(desc.name, value)
+                is String -> editor.putString(property.name, value)
+                is Float -> editor.putFloat(property.name, value)
+                is Int -> editor.putInt(property.name, value)
+                is Boolean -> editor.putBoolean(property.name, value)
+                is Long -> editor.putLong(property.name, value)
                 else -> throw IllegalArgumentException(" variable type is not supported yet!!")
             }
             this.value = value
diff --git a/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/view/activity/BaseActivity.kt b/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/view/activity/BaseActivity.kt
index cf04b73..e6745f0 100644
--- a/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/view/activity/BaseActivity.kt
+++ b/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/view/activity/BaseActivity.kt
@@ -1,32 +1,30 @@
 package com.taskworld.android.restfulandroidkotlin.view.activity
 
-import android.os.Bundle
 import android.content.Context
 import android.content.Intent
-import de.greenrobot.event.EventBus
-import com.taskworld.android.restfulandroidkotlin.event.BaseEvent
-import android.support.v7.app.ActionBarActivity
-import android.util.Log
-import com.taskworld.android.restfulandroidkotlin.extension.tag
+import android.os.Bundle
+import android.support.v7.app.AppCompatActivity
 import android.view.View
+import com.taskworld.android.restfulandroidkotlin.event.BaseEvent
+import de.greenrobot.event.EventBus
 
 /**
  * Created by Kittinun Vantasin on 10/17/14.
  */
 
-abstract class BaseActivity : ActionBarActivity() {
+abstract class BaseActivity : AppCompatActivity() {
 
     abstract val mContentLayoutResourceId: Int
 
     //static instantiate
-    class object {
+    companion object {
         public fun newIntent(context: Context): Intent {
-            return Intent(context, javaClass<BaseActivity>())
+            return Intent(context, BaseActivity::class.java)
         }
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        super<ActionBarActivity>.onCreate(savedInstanceState)
+        super.onCreate(savedInstanceState)
 
         if (mContentLayoutResourceId != 0) {
             setContentView(mContentLayoutResourceId)
@@ -44,7 +42,6 @@ abstract class BaseActivity : ActionBarActivity() {
         }
 
         setUp()
-        Log.v(tag(), tag() + "::onCreate()")
     }
 
     open fun createContentView(): View {
@@ -52,20 +49,17 @@ abstract class BaseActivity : ActionBarActivity() {
     }
 
     override fun onResume() {
-        super<ActionBarActivity>.onResume()
+        super.onResume()
         EventBus.getDefault().register(this)
-        Log.v(tag(), tag() + "::onResume()")
     }
 
     override fun onPause() {
-        super<ActionBarActivity>.onPause()
+        super.onPause()
         EventBus.getDefault().unregister(this)
-        Log.v(tag(), tag() + "::onPause()")
     }
 
     override fun onDestroy() {
-        Log.v(tag(), tag() + "::onDestory()")
-        super<ActionBarActivity>.onDestroy()
+        super.onDestroy()
     }
 
     open fun handleSavedInstanceState(savedInstanceState: Bundle) {
diff --git a/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/view/activity/BaseSpiceActivity.kt b/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/view/activity/BaseSpiceActivity.kt
index 97439a8..6abe2e8 100644
--- a/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/view/activity/BaseSpiceActivity.kt
+++ b/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/view/activity/BaseSpiceActivity.kt
@@ -9,7 +9,7 @@ import com.taskworld.android.restfulandroidkotlin.network.service.TheMovieAPISpi
 
 abstract class BaseSpiceActivity : BaseActivity() {
 
-    val mSpiceManager: SpiceManager = SpiceManager(javaClass<TheMovieAPISpiceService>())
+    val mSpiceManager: SpiceManager = SpiceManager(TheMovieAPISpiceService::class.java)
 
     override fun onStart() {
         super<BaseActivity>.onStart()
diff --git a/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/view/activity/MainActivity.kt b/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/view/activity/MainActivity.kt
index f9c437f..2055965 100644
--- a/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/view/activity/MainActivity.kt
+++ b/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/view/activity/MainActivity.kt
@@ -1,41 +1,29 @@
 package com.taskworld.android.restfulandroidkotlin.view.activity
 
+import android.content.Context
+import android.content.Intent
 import com.taskworld.android.restfulandroidkotlin.R
-import kotlin.properties.Delegates
-import com.taskworld.android.restfulandroidkotlin.extension.bindView
-import android.support.v4.widget.DrawerLayout
-import android.support.v7.widget.Toolbar
-import com.taskworld.android.restfulandroidkotlin.view.fragment.BaseDrawerFragment
 import com.taskworld.android.restfulandroidkotlin.event.OnDrawerToggledEvent
-import com.taskworld.android.restfulandroidkotlin.view.fragment.BaseDrawerFragment.Direction
-import android.widget.TextView
 import com.taskworld.android.restfulandroidkotlin.event.OnToolbarTitleChangedEvent
+import com.taskworld.android.restfulandroidkotlin.view.fragment.BaseDrawerFragment
+import com.taskworld.android.restfulandroidkotlin.view.fragment.BaseDrawerFragment.Direction
 import com.taskworld.android.restfulandroidkotlin.view.fragment.MovieFragment
-import android.content.Context
-import android.content.Intent
+
+import kotlinx.android.synthetic.main.activity_main.*
 
 class MainActivity : BaseSpiceActivity() {
 
     override val mContentLayoutResourceId = R.layout.activity_main
 
-    //widgets
-    val tvBarTitle by Delegates.lazy { bindView<TextView>(R.id.tvBarTitle) }
-
-    val fgLeftNavigationDrawer by Delegates.lazy {
-        getSupportFragmentManager().findFragmentById(R.id.fgLeftNavigationDrawer) as BaseDrawerFragment
-    }
-
-    val dlMain by Delegates.lazy { bindView<DrawerLayout>(R.id.dlMain) }
-    val tbMain by Delegates.lazy { bindView<Toolbar>(R.id.tbMain) }
-
-    class object {
+    companion object {
         fun newIntent(context: Context): Intent {
-           return Intent(context, javaClass<MainActivity>())
+            return Intent(context, MainActivity::class.java)
         }
     }
 
     override fun setUp() {
         setSupportActionBar(tbMain)
+        val fgLeftNavigationDrawer = supportFragmentManager.findFragmentById(R.id.fgLeftNavigationDrawer) as BaseDrawerFragment
         fgLeftNavigationDrawer.setUpAsLeftDrawer(dlMain, tbMain)
 
         val popularCategory = "popular"
@@ -46,8 +34,9 @@ class MainActivity : BaseSpiceActivity() {
     }
 
     fun onEvent(event: OnDrawerToggledEvent) {
-        when (event.direction) {
-            Direction.LEFT -> fgLeftNavigationDrawer.toggleDrawer()
+        val fgLeftNavigationDrawer = supportFragmentManager.findFragmentById(R.id.fgLeftNavigationDrawer) as BaseDrawerFragment
+        if (event.direction == Direction.LEFT) {
+            fgLeftNavigationDrawer.toggleDrawer()
         }
     }
 
diff --git a/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/view/activity/MovieDetailActivity.kt b/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/view/activity/MovieDetailActivity.kt
index c83771b..3c8392c 100644
--- a/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/view/activity/MovieDetailActivity.kt
+++ b/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/view/activity/MovieDetailActivity.kt
@@ -1,30 +1,30 @@
 package com.taskworld.android.restfulandroidkotlin.view.activity
 
-import kotlin.properties.Delegates
-import android.support.v7.widget.RecyclerView
-import android.support.v7.widget.LinearLayoutManager
 import android.content.Context
 import android.content.Intent
-import com.taskworld.android.restfulandroidkotlin.extension.bindView
-import com.taskworld.android.restfulandroidkotlin.model.Movie
+import android.os.Bundle
+import android.support.v4.view.PagerAdapter
+import android.support.v4.view.ViewPager
+import android.support.v7.widget.LinearLayoutManager
+import android.support.v7.widget.RecyclerView
+import android.view.LayoutInflater
 import android.view.View
+import android.view.ViewGroup
+import android.view.ViewGroup.LayoutParams
 import android.widget.ImageView
 import android.widget.TextView
-import com.taskworld.android.restfulandroidkotlin.model.Cast
-import com.taskworld.android.restfulandroidkotlin.adapter.ParallaxRecyclerAdapter
-import android.os.Bundle
 import com.squareup.picasso.Picasso
-import android.support.v7.widget.Toolbar
 import com.taskworld.android.restfulandroidkotlin.R
-import android.view.ViewGroup
-import android.view.LayoutInflater
-import android.support.v4.view.ViewPager
-import android.support.v4.view.PagerAdapter
+import com.taskworld.android.restfulandroidkotlin.adapter.ParallaxRecyclerAdapter
+import com.taskworld.android.restfulandroidkotlin.extension.bindView
+import com.taskworld.android.restfulandroidkotlin.model.Cast
 import com.taskworld.android.restfulandroidkotlin.model.Image
-import android.view.ViewGroup.LayoutParams
+import com.taskworld.android.restfulandroidkotlin.model.Movie
 import com.taskworld.android.restfulandroidkotlin.resource.client.ResourceClient
 import com.taskworld.android.restfulandroidkotlin.resource.router.ResourceRouterImpl
 import com.taskworld.android.restfulandroidkotlin.util.CircularTransformation
+import kotlinx.android.synthetic.main.activity_movie_detail.*
+import kotlin.properties.Delegates
 
 /**
  * Created by Kittinun Vantasin on 11/11/14.
@@ -34,36 +34,25 @@ class MovieDetailActivity : BaseSpiceActivity() {
 
     override val mContentLayoutResourceId: Int = R.layout.activity_movie_detail
 
-    //widgets
     //header
     var tvMovieOverview: TextView by Delegates.notNull()
     var vpMovieCover: ViewPager by Delegates.notNull()
 
-    //toolbar
-    val tbMovieDetail by Delegates.lazy { bindView<Toolbar>(R.id.tbMovieDetail) }
-    val tvBarTitle by Delegates.lazy { bindView<TextView>(R.id.tvBarTitle) }
-
-    //list
-    val rvMovieCast by Delegates.lazy { bindView<RecyclerView>(R.id.rvMovieCast) }
-
     //adapter
-    val mMovieCastAdapter by Delegates.lazy { ParallaxRecyclerAdapter(listOf<Cast>()) }
-    val mMovieCoverAdapter by Delegates.lazy { MovieCoverImageAdapter() }
+    val mMovieCastAdapter = ParallaxRecyclerAdapter(listOf<Cast>())
+    val mMovieCoverAdapter = MovieCoverImageAdapter()
 
     //data
     var mMovieId = 0
     var mCasts by Delegates.observable(listOf<Cast>(), { meta, oldCasts, newCasts ->
         mMovieCastAdapter.setData(newCasts)
     })
-    var mCoverImages by Delegates.observable(listOf<Image>(), { meta, oldCoverImages, newCoverImages ->
-        mMovieCoverAdapter.data = newCoverImages
-    })
 
-    class object {
+    companion object {
         val ARG_MOVIE_ID = "movie_id"
 
         public fun newIntent(context: Context, id: Int): Intent {
-            val intent = Intent(context, javaClass<MovieDetailActivity>())
+            val intent = Intent(context, MovieDetailActivity::class.java)
             intent.putExtra(ARG_MOVIE_ID, id)
             return intent
         }
@@ -79,48 +68,49 @@ class MovieDetailActivity : BaseSpiceActivity() {
         mMovieCastAdapter.implementRecyclerAdapterMethods(MoveCastParallaxRecyclerAdapter())
         mMovieCastAdapter.setParallaxHeader(createHeaderView(), rvMovieCast)
         mMovieCastAdapter.setOnParallaxScroll { percentage, offset, parallaxView ->
-            val d = tbMovieDetail.getBackground()
-            d.setAlpha(Math.round((percentage) * 255))
-            tbMovieDetail.setBackground(d)
+            val d = tbMovieDetail.background
+            d.alpha = Math.round((percentage) * 255)
+            tbMovieDetail.background = d
         }
 
-        rvMovieCast.setLayoutManager(createLayoutManager())
-        rvMovieCast.setAdapter(mMovieCastAdapter)
+        rvMovieCast.layoutManager = createLayoutManager()
+        rvMovieCast.adapter = mMovieCastAdapter
 
         var client = ResourceClient.Builder()
                 .setRouter(ResourceRouterImpl.newInstance(null, "credits"))
                 .setSpiceManager(getServiceSpiceManager()).build()
-        client.find(javaClass<Movie>(), mMovieId.toString())
+        client.find(Movie::class.java, mMovieId.toString())
 
         client = ResourceClient.Builder()
                 .setRouter(ResourceRouterImpl.newInstance())
                 .setSpiceManager(getServiceSpiceManager()).build()
-        client.find(javaClass<Movie>(), mMovieId.toString())
+        client.find(Movie::class.java, mMovieId.toString())
 
         client = ResourceClient.Builder()
                 .setRouter(ResourceRouterImpl.newInstance(null, "images"))
                 .setSpiceManager(getServiceSpiceManager()).build()
-        client.find(javaClass<Movie>(), mMovieId.toString())
+        client.find(Movie::class.java, mMovieId.toString())
     }
 
     fun onEvent(movie: Movie) {
-        tvBarTitle.setText(movie.getTitle())
-        tvMovieOverview.setText(movie.getOverview())
+        tvBarTitle.text = movie.title
+        tvMovieOverview.text = movie.overview
     }
 
     fun onEvent(casts: Cast.CastList) {
-        mCasts = casts.getCasts()
+        mCasts = casts.casts
     }
 
     fun onEvent(images: Image.PosterList) {
-        mCoverImages = images.getResults()
+        images.results.forEach { mMovieCoverAdapter.data.add(it) }
+        vpMovieCover.adapter = mMovieCoverAdapter
     }
 
     fun createHeaderView(): View {
-        val headerView = getLayoutInflater().inflate(R.layout.list_header_movie_detail, null)
+        val headerView = layoutInflater.inflate(R.layout.list_header_movie_detail, null)
         tvMovieOverview = headerView.bindView<TextView>(R.id.tvMovieOverview)
         vpMovieCover = headerView.bindView<ViewPager>(R.id.vpMovieCover)
-        vpMovieCover.setAdapter(mMovieCoverAdapter)
+        vpMovieCover.adapter = mMovieCoverAdapter
         return headerView
     }
 
@@ -130,9 +120,8 @@ class MovieDetailActivity : BaseSpiceActivity() {
 
     inner class MovieCoverImageAdapter : PagerAdapter() {
 
-        var data = listOf<Image>()
+        var data: MutableList<Image> = arrayListOf()
             set (value) {
-                $data = value
                 notifyDataSetChanged()
             }
 
@@ -141,14 +130,14 @@ class MovieDetailActivity : BaseSpiceActivity() {
         }
 
         override fun instantiateItem(container: ViewGroup, position: Int): Any? {
-            val viewPagerItem = LayoutInflater.from(container.getContext()).inflate(R.layout.view_pager_item_movie_cover, container, false)
+            val viewPagerItem = LayoutInflater.from(container.context).inflate(R.layout.view_pager_item_movie_cover, container, false)
             val ivMovieCover = viewPagerItem.bindView<ImageView>(R.id.ivMovieCover)
             val tvMovieCoverVoteCount = viewPagerItem.bindView<TextView>(R.id.tvMovieCoverVoteCount)
 
             //bind views
-            val image = mCoverImages[position]
-            Picasso.with(container.getContext()).load("https://image.tmdb.org/t/p/w500/" + image.getFilePath()).into(ivMovieCover)
-            tvMovieCoverVoteCount.setText(image.getVoteCount().toString())
+            val image = data.get(position)
+            Picasso.with(container.context).load("https://image.tmdb.org/t/p/w500/" + image.filePath).into(ivMovieCover)
+            tvMovieCoverVoteCount.text = image.voteCount.toString()
 
             container.addView(viewPagerItem, LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT)
             return viewPagerItem
@@ -174,7 +163,7 @@ class MovieDetailActivity : BaseSpiceActivity() {
         var mContext: Context by Delegates.notNull()
 
         override fun onCreateViewHolder(container: ViewGroup?, i: Int): RecyclerView.ViewHolder? {
-            mContext = container!!.getContext()
+            mContext = container!!.context
             val view = LayoutInflater.from(mContext).inflate(R.layout.recycle_view_item_movie_cast, container, false)
             return MovieCastViewHolder(view)
         }
@@ -183,12 +172,12 @@ class MovieDetailActivity : BaseSpiceActivity() {
 
             val cast = mCasts[position]
             val holder = viewHolder as MovieCastViewHolder
-            Picasso.with(mContext).load("https://image.tmdb.org/t/p/w150/" + cast.getProfilePath())
+            Picasso.with(mContext).load("https://image.tmdb.org/t/p/w150/" + cast.profilePath)
                     .transform(CircularTransformation())
                     //.placeholder(R.drawable.ic_launcher)
                     .into(holder.ivCast)
-            holder.tvCastName.setText(cast.getName())
-            holder.tvCastCharacter.setText("as " + cast.getCharacter())
+            holder.tvCastName.text = cast.name
+            holder.tvCastCharacter.text = "as " + cast.character
         }
 
         override fun getItemCount(): Int {
diff --git a/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/view/activity/MovieListActivity.kt b/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/view/activity/MovieListActivity.kt
index 0461e5f..3202c96 100644
--- a/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/view/activity/MovieListActivity.kt
+++ b/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/view/activity/MovieListActivity.kt
@@ -1,22 +1,20 @@
 package com.taskworld.android.restfulandroidkotlin.view.activity
 
-import com.taskworld.android.restfulandroidkotlin.R
-import kotlin.properties.Delegates
 import android.content.Context
 import android.content.Intent
-import com.taskworld.android.restfulandroidkotlin.extension.bindView
-import android.widget.ListView
-import android.widget.ArrayAdapter
-import com.taskworld.android.restfulandroidkotlin.model.Movie
-import com.taskworld.android.restfulandroidkotlin.extension.tag
-import android.util.Log
 import android.view.View
 import android.view.ViewGroup
+import android.widget.ArrayAdapter
 import android.widget.TextView
+import com.taskworld.android.restfulandroidkotlin.R
+import com.taskworld.android.restfulandroidkotlin.extension.bindView
+import com.taskworld.android.restfulandroidkotlin.extension.toast
+import com.taskworld.android.restfulandroidkotlin.model.Movie
 import com.taskworld.android.restfulandroidkotlin.resource.client.ResourceClient
 import com.taskworld.android.restfulandroidkotlin.resource.router.ResourceRouterImpl
-import com.taskworld.android.restfulandroidkotlin.extension.toast
 import io.realm.Realm
+import kotlinx.android.synthetic.main.activity_movie_list.*
+import kotlin.properties.Delegates
 
 /**
  * Created by Kittinun Vantasin on 10/28/14.
@@ -26,62 +24,58 @@ class MovieListActivity : BaseSpiceActivity() {
 
     override val mContentLayoutResourceId: Int = R.layout.activity_movie_list;
 
-    //widget
-    val lvMovie by Delegates.lazy { bindView<ListView>(R.id.lvMovie) }
-
     //adapter
-    val mMovieAdapter by Delegates.lazy { MovieAdapter() }
+    val mMovieAdapter = MovieAdapter()
 
     //data
     var mItems by Delegates.observable(arrayListOf<Movie>(), { meta, oldItems, newItems ->
-        Log.i(tag(), "${oldItems.size} -> ${newItems.size}")
         mMovieAdapter.clear()
         mMovieAdapter.addAll(newItems)
         mMovieAdapter.notifyDataSetChanged()
     })
 
-    val mRealm by Delegates.lazy { Realm.getInstance(this) }
+    val mRealm = Realm.getInstance(this)
 
-    class object {
+    companion object {
         public fun newIntent(context: Context): Intent {
-            return Intent(context, javaClass<MovieListActivity>())
+            return Intent(context, MovieListActivity::class.java)
         }
     }
 
     override fun setUp() {
         mItems.clear()
-        lvMovie.setAdapter(mMovieAdapter)
+        lvMovie.adapter = mMovieAdapter
         val client = ResourceClient.Builder()
                 .setRealm(mRealm)
                 .setRouter(ResourceRouterImpl.newInstance("now_playing"))
                 .setSpiceManager(getServiceSpiceManager()).build()
-        client.findAll(javaClass<Movie>())
+        client.findAll(Movie::class.java)
     }
 
     fun onEvent(items: Movie.ResultList) {
-        mItems = items.getResults().toArrayList()
+        mItems = items.results.toArrayList()
 
         val client = ResourceClient.Builder()
                 .setRealm(mRealm)
                 .setRouter(ResourceRouterImpl.newInstance())
                 .setSpiceManager(getServiceSpiceManager()).build()
-        client.find(javaClass<Movie>(), "180299")
+        client.find(Movie::class.java, "180299")
     }
 
     fun onEvent(item: Movie) {
-        toast(item.getTitle())
+        toast(item.title)
     }
 
     inner class MovieAdapter : ArrayAdapter<Movie>(this,
             android.R.layout.simple_expandable_list_item_2, android.R.id.text1, mItems) {
 
         override fun getView(position: Int, convertView: View?, parent: ViewGroup): View? {
-            val view = super<ArrayAdapter>.getView(position, convertView, parent)
+            val view = super.getView(position, convertView, parent)
             val tv1 = view.bindView<TextView>(android.R.id.text1)
             val tv2 = view.bindView<TextView>(android.R.id.text2)
             val movie = getItem(position)
-            tv1.setText(movie.getTitle())
-            tv2.setText(movie.getPopularity().toString())
+            tv1.text = movie.title
+            tv2.text = movie.popularity.toString()
             return view;
         }
     }
diff --git a/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/view/activity/ProductEditActivity.kt b/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/view/activity/ProductEditActivity.kt
index 1b4221d..d27d3bc 100644
--- a/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/view/activity/ProductEditActivity.kt
+++ b/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/view/activity/ProductEditActivity.kt
@@ -1,18 +1,15 @@
 package com.taskworld.android.restfulandroidkotlin.view.activity
 
-import com.taskworld.android.restfulandroidkotlin.R
-import android.view.Menu
-import android.view.MenuItem
-import android.content.Intent
+import android.app.Activity
 import android.content.Context
+import android.content.Intent
 import android.os.Bundle
-import io.realm.Realm
-import kotlin.properties.Delegates
-import com.taskworld.android.restfulandroidkotlin.extension.bindView
-import android.widget.EditText
-import android.widget.Button
-import android.app.Activity
+import android.view.Menu
+import android.view.MenuItem
+import com.taskworld.android.restfulandroidkotlin.R
 import com.taskworld.android.restfulandroidkotlin.model.Product
+import io.realm.Realm
+import kotlinx.android.synthetic.main.activity_product_edit.*
 
 /**
  * Created by Kittinun Vantasin on 10/20/14.
@@ -22,24 +19,19 @@ class ProductEditActivity : BaseActivity() {
 
     override val mContentLayoutResourceId = R.layout.activity_product_edit
 
-    //widgets
-    val etName by Delegates.lazy { bindView<EditText>(R.id.etName) }
-    val etPrice by Delegates.lazy { bindView<EditText>(R.id.etPrice) }
-    val btDelete by Delegates.lazy { bindView<Button>(R.id.btDelete) }
-
     //data
     var mProductName: String? = null
     var mProduct: Product? = null
 
-    class object {
+    companion object {
         val ARG_PRODUCT_NAME = "product_name"
 
         public fun newIntent(context: Context): Intent {
-            return Intent(context, javaClass<ProductEditActivity>())
+            return Intent(context, ProductEditActivity::class.java)
         }
 
         public fun newIntent(context: Context, productName: String): Intent {
-            var intent = Intent(context, javaClass<ProductEditActivity>())
+            var intent = Intent(context, ProductEditActivity::class.java)
             intent.putExtra(ARG_PRODUCT_NAME, productName)
             return intent
         }
@@ -49,35 +41,34 @@ class ProductEditActivity : BaseActivity() {
         if (mProductName == null) return
 
         val realm = Realm.getInstance(this)
-        mProduct = realm.where(javaClass<Product>()).equalTo(Product.Field.name.toString(), mProductName).findFirst()
+        mProduct = realm.where(Product::class.java).equalTo(Product.Field.name.toString(), mProductName).findFirst()
 
         btDelete.setOnClickListener { view -> deleteProduct() }
 
-        etName.setText(mProduct!!.getName())
-        etPrice.setText(mProduct!!.getPrice().toString())
+        etName.setText(mProduct!!.name)
+        etPrice.setText(mProduct!!.price.toString())
     }
 
     override fun handleIntentExtras(intentExtras: Bundle) {
         mProductName = intentExtras.getString(ARG_PRODUCT_NAME)
-        super<BaseActivity>.handleIntentExtras(intentExtras)
+        super.handleIntentExtras(intentExtras)
     }
 
     override fun onCreateOptionsMenu(menu: Menu?): Boolean {
-        val inflater = getMenuInflater();
-        inflater.inflate(R.menu.menu_edit_product, menu)
-        return super<BaseActivity>.onCreateOptionsMenu(menu)
+        menuInflater.inflate(R.menu.menu_edit_product, menu)
+        return super.onCreateOptionsMenu(menu)
     }
 
     override fun onOptionsItemSelected(item: MenuItem?): Boolean {
-        when (item?.getItemId()) {
+        when (item?.itemId) {
             R.id.miSave -> saveProduct()
         }
-        return super<BaseActivity>.onOptionsItemSelected(item)
+        return super.onOptionsItemSelected(item)
     }
 
     fun saveProduct() {
-        mProductName = etName.getText().toString()
-        val price = etPrice.getText().toString().toInt()
+        mProductName = etName.text.toString()
+        val price = etPrice.text.toString().toInt()
         setResult(Activity.RESULT_OK)
         finish()
     }
diff --git a/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/view/activity/ProductListActivity.kt b/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/view/activity/ProductListActivity.kt
index 961fa79..32a39d7 100644
--- a/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/view/activity/ProductListActivity.kt
+++ b/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/view/activity/ProductListActivity.kt
@@ -1,23 +1,21 @@
 package com.taskworld.android.restfulandroidkotlin.view.activity
 
-import com.taskworld.android.restfulandroidkotlin.R
+import android.app.Activity
 import android.content.Context
 import android.content.Intent
-import kotlin.properties.Delegates
-import com.taskworld.android.restfulandroidkotlin.extension.bindView
-import android.widget.ListView
 import android.view.Menu
 import android.view.MenuItem
-import io.realm.Realm
-import android.widget.ArrayAdapter
 import android.view.View
 import android.view.ViewGroup
+import android.widget.ArrayAdapter
 import android.widget.TextView
-import android.app.Activity
-import com.taskworld.android.restfulandroidkotlin.extension.tag
-import android.util.Log
+import com.taskworld.android.restfulandroidkotlin.R
+import com.taskworld.android.restfulandroidkotlin.extension.bindView
 import com.taskworld.android.restfulandroidkotlin.extension.deleteAll
 import com.taskworld.android.restfulandroidkotlin.model.Product
+import io.realm.Realm
+import kotlinx.android.synthetic.main.activity_product_list.*
+import kotlin.properties.Delegates
 
 /**
  * Created by Kittinun Vantasin on 10/18/14.
@@ -27,52 +25,47 @@ class ProductListActivity : BaseActivity() {
 
     override val mContentLayoutResourceId = R.layout.activity_product_list
 
-    //widget
-    val lvProduct by Delegates.lazy { bindView<ListView>(R.id.lvProduct) }
-
     //adapter
-    val mProductAdapter: ProductAdapter by Delegates.lazy { ProductAdapter() }
+    val mProductAdapter: ProductAdapter = ProductAdapter()
 
     //data
     var mItems by Delegates.observable(arrayListOf<Product>(), { meta, oldItems, newItems ->
-        Log.i(tag(), "${oldItems.size} -> ${newItems.size}")
         mProductAdapter.clear()
         mProductAdapter.addAll(newItems)
         mProductAdapter.notifyDataSetChanged()
     })
 
-    class object {
+    companion object {
         public fun newInstance(context: Context): Intent {
-            return Intent(context, javaClass<ProductListActivity>())
+            return Intent(context, ProductListActivity::class.java)
         }
     }
 
     override fun setUp() {
         mItems.clear()
-        lvProduct.setAdapter(mProductAdapter)
-        lvProduct.setOnItemClickListener { (adapterView, view, position, id) ->
+        lvProduct.adapter = mProductAdapter
+        lvProduct.setOnItemClickListener { adapterView, view, position, id ->
             val selectedProduct = mProductAdapter.getItem(position)
-            startActivityForResult(ProductEditActivity.newIntent(this, selectedProduct.getName()), 999)
+            startActivityForResult(ProductEditActivity.newIntent(this, selectedProduct.name), 999)
         }
         fetchProducts()
     }
 
     override fun onCreateOptionsMenu(menu: Menu?): Boolean {
-        val inflater = getMenuInflater()
-        inflater.inflate(R.menu.menu_list_product, menu)
-        return super<BaseActivity>.onCreateOptionsMenu(menu)
+        menuInflater.inflate(R.menu.menu_list_product, menu)
+        return super.onCreateOptionsMenu(menu)
     }
 
     override fun onOptionsItemSelected(item: MenuItem?): Boolean {
-        when (item?.getItemId()) {
+        when (item?.itemId) {
             R.id.miAddProduct -> navigateToProductEditActivity()
             R.id.miDeleteAll -> {
                 val r = Realm.getInstance(this)
-                r.deleteAll(javaClass<Product>())
+                r.deleteAll(Product::class.java)
                 fetchProducts()
             }
         }
-        return super<BaseActivity>.onOptionsItemSelected(item)
+        return super.onOptionsItemSelected(item)
     }
 
     fun navigateToProductEditActivity() {
@@ -83,23 +76,22 @@ class ProductListActivity : BaseActivity() {
         if (resultCode == Activity.RESULT_OK) {
             fetchProducts()
         }
-        super<BaseActivity>.onActivityResult(requestCode, resultCode, data)
+        super.onActivityResult(requestCode, resultCode, data)
     }
 
     fun fetchProducts() {
-        mItems = Realm.getInstance(this).where(javaClass<Product>()).findAll().toArrayList()
+        mItems = Realm.getInstance(this).where(Product::class.java).findAll().toArrayList()
     }
 
-    inner class ProductAdapter : ArrayAdapter<Product>(this,
-            android.R.layout.simple_expandable_list_item_2, android.R.id.text1, mItems) {
+    inner class ProductAdapter : ArrayAdapter<Product>(this, android.R.layout.simple_expandable_list_item_2, android.R.id.text1, mItems) {
 
         override fun getView(position: Int, convertView: View?, parent: ViewGroup): View? {
-            val view = super<ArrayAdapter>.getView(position, convertView, parent)
+            val view = super.getView(position, convertView, parent)
             val tv1 = view.bindView<TextView>(android.R.id.text1)
             val tv2 = view.bindView<TextView>(android.R.id.text2)
             val product = getItem(position)
-            tv1.setText(product.getName())
-            tv2.setText("$${product.getPrice().toString()}")
+            tv1.text = product.name
+            tv2.text = "$${product.price.toString()}"
             return view
         }
     }
diff --git a/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/view/activity/SignInActivity.kt b/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/view/activity/SignInActivity.kt
index 9fda6fe..8e52379 100644
--- a/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/view/activity/SignInActivity.kt
+++ b/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/view/activity/SignInActivity.kt
@@ -1,18 +1,13 @@
 package com.taskworld.android.restfulandroidkotlin.view.activity
 
+import android.graphics.Color
+import android.view.View
 import com.taskworld.android.restfulandroidkotlin.R
-import kotlin.properties.Delegates
 import com.taskworld.android.restfulandroidkotlin.action.SignInUIAction
-import android.widget.Button
-import com.taskworld.android.restfulandroidkotlin.extension.bindView
-import android.widget.EditText
 import com.taskworld.android.restfulandroidkotlin.presenter.SignInPresenterImpl
-import android.view.View
-import android.widget.ProgressBar
-import de.greenrobot.event.EventBus
-import android.widget.TextView
-import android.graphics.Color
 import com.taskworld.android.restfulandroidkotlin.util.Preference
+import de.greenrobot.event.EventBus
+import kotlinx.android.synthetic.main.activity_signin.*
 
 /**
  * Created by Kittinun Vantasin on 11/14/14.
@@ -22,19 +17,11 @@ class SignInActivity : BaseSpiceActivity(), SignInUIAction {
 
     override val mContentLayoutResourceId: Int = R.layout.activity_signin
 
-    //widgets
-    val etUsername by Delegates.lazy { bindView<EditText>(R.id.etUsername) }
-    val etPassword by Delegates.lazy { bindView<EditText>(R.id.etPassword) }
-
-    val btSignIn by Delegates.lazy { bindView<Button>(R.id.btSignIn) }
-    val pgProgress by Delegates.lazy { bindView<ProgressBar>(R.id.pgProgress) }
-    val tvMessage by Delegates.lazy { bindView<TextView>(R.id.tvMessage) }
-
     //presenter
-    val mPresenter by Delegates.lazy { SignInPresenterImpl(this, getServiceSpiceManager(), EventBus.getDefault()) }
+    val mPresenter = SignInPresenterImpl(this, getServiceSpiceManager(), EventBus.getDefault())
 
     override fun setUp() {
-        btSignIn.setOnClickListener { view ->
+        btSignIn.setOnClickListener {
             mPresenter.logInWithCredentials(etUsername.getText().toString(), etPassword.getText().toString())
         }
     }
@@ -81,7 +68,7 @@ class SignInActivity : BaseSpiceActivity(), SignInUIAction {
 
     override fun navigateToMain(sessionId: String) {
         Preference.with(this).sessionId = sessionId
-        Preference.with(this).username = etUsername.getText().toString()
+        Preference.with(this).username = etUsername.text.toString()
 
         startActivity(MainActivity.newIntent(this))
     }
diff --git a/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/view/fragment/BaseDrawerFragment.kt b/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/view/fragment/BaseDrawerFragment.kt
index 6ae4ba0..a776236 100644
--- a/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/view/fragment/BaseDrawerFragment.kt
+++ b/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/view/fragment/BaseDrawerFragment.kt
@@ -1,13 +1,13 @@
 package com.taskworld.android.restfulandroidkotlin.view.fragment
 
-import android.view.View
+import android.content.res.Configuration
+import android.support.v4.view.GravityCompat
 import android.support.v4.widget.DrawerLayout
 import android.support.v7.app.ActionBarDrawerToggle
 import android.support.v7.widget.Toolbar
-import com.taskworld.android.restfulandroidkotlin.R
 import android.view.MenuItem
-import android.content.res.Configuration
-import android.support.v4.view.GravityCompat
+import android.view.View
+import com.taskworld.android.restfulandroidkotlin.R
 
 /**
  * Created by Kittinun Vantasin on 11/5/14.
@@ -16,7 +16,7 @@ import android.support.v4.view.GravityCompat
 abstract class BaseDrawerFragment : BaseFragment() {
 
     enum class Direction {
-        LEFT
+        LEFT,
         RIGHT
     }
 
@@ -26,48 +26,37 @@ abstract class BaseDrawerFragment : BaseFragment() {
 
     var mDrawerGravity = GravityCompat.START
     var mDirection: Direction = Direction.LEFT
-        set (value) {
-            $mDirection = value
-            when (value) {
-                Direction.LEFT -> mDrawerGravity = GravityCompat.START
-                Direction.RIGHT -> mDrawerGravity = GravityCompat.END
-            }
-        }
 
     public fun setUpAsLeftDrawer(drawerLayout: DrawerLayout, toolbar: Toolbar) {
         setUpDrawer(Direction.LEFT, drawerLayout, toolbar)
     }
 
-    public fun setUpAsRightDrawer(drawerLayout: DrawerLayout, toolbar: Toolbar) {
-        setUpDrawer(Direction.RIGHT, drawerLayout, toolbar)
-    }
-
     fun setUpDrawer(direction: Direction, drawerLayout: DrawerLayout, toolBar: Toolbar) {
         mDirection = direction
         dlDrawer = drawerLayout
 
         //        dlDrawer.setDrawerShadow(R.drawable.drawer_shadow, GravityCompat.START)
         mDrawerToggle = object : ActionBarDrawerToggle(
-                getActivity(),
+                activity,
                 dlDrawer,
                 toolBar,
                 R.string.navigation_drawer_open,
                 R.string.navigation_drawer_close) {
 
             override fun onDrawerClosed(drawerView: View?) {
-                super<ActionBarDrawerToggle>.onDrawerClosed(drawerView)
-                if (!isAdded()) return
+                super.onDrawerClosed(drawerView)
+                if (!isAdded) return
 
-                getActivity().invalidateOptionsMenu()
+                activity.invalidateOptionsMenu()
 
                 onDrawerClosed()
             }
 
             override fun onDrawerOpened(drawerView: View?) {
-                super<ActionBarDrawerToggle>.onDrawerOpened(drawerView)
-                if (!isAdded()) return
+                super.onDrawerOpened(drawerView)
+                if (!isAdded) return
 
-                getActivity().invalidateOptionsMenu()
+                activity.invalidateOptionsMenu()
                 onDrawerOpened()
             }
         }
@@ -77,7 +66,7 @@ abstract class BaseDrawerFragment : BaseFragment() {
     }
 
     override fun onConfigurationChanged(newConfig: Configuration?) {
-        super<BaseFragment>.onConfigurationChanged(newConfig)
+        super.onConfigurationChanged(newConfig)
 
         mDrawerToggle?.onConfigurationChanged(newConfig)
     }
@@ -87,7 +76,7 @@ abstract class BaseDrawerFragment : BaseFragment() {
             return true;
         }
 
-        return super<BaseFragment>.onOptionsItemSelected(item)
+        return super.onOptionsItemSelected(item)
     }
 
     fun closeDrawer() {
diff --git a/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/view/fragment/BaseFragment.kt b/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/view/fragment/BaseFragment.kt
index 2b1ec2d..6a24cdb 100644
--- a/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/view/fragment/BaseFragment.kt
+++ b/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/view/fragment/BaseFragment.kt
@@ -1,15 +1,13 @@
 package com.taskworld.android.restfulandroidkotlin.view.fragment
 
-import android.support.v4.app.Fragment
 import android.os.Bundle
-import com.taskworld.android.restfulandroidkotlin.event.BaseEvent
-import de.greenrobot.event.EventBus
+import android.support.v4.app.Fragment
 import android.view.LayoutInflater
-import android.view.ViewGroup
 import android.view.View
+import android.view.ViewGroup
+import com.taskworld.android.restfulandroidkotlin.event.BaseEvent
+import de.greenrobot.event.EventBus
 import kotlin.properties.Delegates
-import android.util.Log
-import com.taskworld.android.restfulandroidkotlin.extension.tag
 
 /**
  * Created by Kittinun Vantasin on 11/5/14.
@@ -37,30 +35,25 @@ abstract class BaseFragment : Fragment() {
         }
 
         setUp()
-        Log.v(tag(), tag() + "::onCreate()")
     }
 
     override fun onCreateView(inflater: LayoutInflater?, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         vRoot = inflater!!.inflate(mContentLayoutResourceId, container, false)
         setUpUI(vRoot)
-        Log.v(tag(), tag() + "::onCreateView()")
         return vRoot
     }
 
     override fun onResume() {
         super<Fragment>.onResume()
         EventBus.getDefault().register(this)
-        Log.v(tag(), tag() + "::onResume()")
     }
 
     override fun onPause() {
         super<Fragment>.onPause()
         EventBus.getDefault().unregister(this)
-        Log.v(tag(), tag() + "::onPause()")
     }
 
     override fun onDestroy() {
-        Log.v(tag(), tag() + "::onDestory()")
         super<Fragment>.onDestroy()
     }
 
diff --git a/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/view/fragment/BaseSpiceFragment.kt b/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/view/fragment/BaseSpiceFragment.kt
index 9a60b54..dc15356 100644
--- a/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/view/fragment/BaseSpiceFragment.kt
+++ b/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/view/fragment/BaseSpiceFragment.kt
@@ -9,7 +9,7 @@ import com.taskworld.android.restfulandroidkotlin.network.service.TheMovieAPISpi
 
 abstract class BaseSpiceFragment : BaseFragment() {
 
-    val mSpiceManager: SpiceManager = SpiceManager(javaClass<TheMovieAPISpiceService>())
+    val mSpiceManager: SpiceManager = SpiceManager(TheMovieAPISpiceService::class.java)
 
     override fun onStart() {
         super<BaseFragment>.onStart()
diff --git a/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/view/fragment/MainNavigationDrawerFragment.kt b/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/view/fragment/MainNavigationDrawerFragment.kt
index c823ffa..e77ad05 100644
--- a/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/view/fragment/MainNavigationDrawerFragment.kt
+++ b/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/view/fragment/MainNavigationDrawerFragment.kt
@@ -1,96 +1,94 @@
 package com.taskworld.android.restfulandroidkotlin.view.fragment
 
-import android.view.View
-import kotlin.properties.Delegates
-import android.widget.ListView
-import com.taskworld.android.restfulandroidkotlin.extension.bindView
-import android.widget.ArrayAdapter
-import com.taskworld.android.restfulandroidkotlin.R
+import android.os.Bundle
 import android.view.LayoutInflater
-import android.widget.ImageView
-import com.squareup.picasso.Picasso
-import android.widget.TextView
-import android.util.Log
-import com.taskworld.android.restfulandroidkotlin.extension.tag
-import android.widget.ImageButton
+import android.view.View
+import android.view.ViewGroup
+import android.widget.*
 import com.octo.android.robospice.SpiceManager
-import com.taskworld.android.restfulandroidkotlin.network.service.TheMovieAPISpiceService
+import com.squareup.picasso.Picasso
+import com.taskworld.android.restfulandroidkotlin.R
+import com.taskworld.android.restfulandroidkotlin.extension.bindView
 import com.taskworld.android.restfulandroidkotlin.extension.toast
+import com.taskworld.android.restfulandroidkotlin.network.service.TheMovieAPISpiceService
 import com.taskworld.android.restfulandroidkotlin.util.Preference
+import kotlin.properties.Delegates
 
 /**
  * Created by Kittinun Vantasin on 11/5/14.
  */
 
 class MainNavigationDrawerFragment : BaseDrawerFragment() {
+    override val mContentLayoutResourceId: Int
+        get() = throw UnsupportedOperationException()
 
-    override val mContentLayoutResourceId: Int = R.layout.fragment_main_navigation_drawer
-
-    val mSpiceManager: SpiceManager = SpiceManager(javaClass<TheMovieAPISpiceService>())
+    val mSpiceManager: SpiceManager = SpiceManager(TheMovieAPISpiceService::class.java)
 
     //widgets
-    val lvDrawer by Delegates.lazy { getRootView().bindView<ListView>(R.id.lvMainNavigation) }
     var tvAccountName: TextView by Delegates.notNull()
 
     //data
     var mCurrentSelectedPosition = 0
 
+    var mView: View by Delegates.notNull()
+
     override fun setUp() {
     }
 
-    override fun setUpUI(view: View) {
-        lvDrawer.addHeaderView(createHeaderView())
+    override fun onCreateView(inflater: LayoutInflater?, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        mView = inflater!!.inflate(R.layout.fragment_main_navigation_drawer, container, false)
 
-        lvDrawer.setAdapter(ArrayAdapter(
-                getActivity(),
-                android.R.layout.simple_list_item_activated_1,
-                android.R.id.text1,
-                listOf("Movies", "TVs")))
+        var lvMainNavigation = mView.findViewById(R.id.lvMainNavigation) as ListView
+        lvMainNavigation.addHeaderView(createHeaderView())
 
-        lvDrawer.setItemChecked(1, true)
-        lvDrawer.setOnItemClickListener { parent, view, position, id ->
-            val ft = getFragmentManager().beginTransaction()
+        lvMainNavigation.adapter = ArrayAdapter(activity, android.R.layout.simple_list_item_activated_1, android.R.id.text1, listOf("Movies", "TVs"))
+
+        lvMainNavigation.setItemChecked(1, true)
+        lvMainNavigation.setOnItemClickListener { parent, view, position, id ->
+            val ft = fragmentManager.beginTransaction()
             when (position) {
                 1 -> ft.replace(R.id.flContainer, MovieFragment.newInstance())
                 2 -> ft.replace(R.id.flContainer, TVFragment.newInstance())
             }
             ft.commit()
-            selectItem(position)
+            selectItem(lvMainNavigation, position)
         }
+
+        return mView
     }
 
     override fun onStart() {
-        super<BaseDrawerFragment>.onStart()
-        mSpiceManager.start(getActivity())
+        super.onStart()
+        mSpiceManager.start(activity)
     }
 
     override fun onStop() {
-        super<BaseDrawerFragment>.onStop()
+        super.onStop()
         mSpiceManager.shouldStop()
     }
 
-    fun selectItem(position: Int) {
+    fun selectItem(listView: ListView, position: Int) {
         mCurrentSelectedPosition = position
-        lvDrawer.setItemChecked(position, true)
+        listView.setItemChecked(position, true)
         closeDrawer()
     }
 
     override fun onDrawerClosed() {
-        Log.v(tag(), getString(R.string.navigation_drawer_close))
+
     }
 
     override fun onDrawerOpened() {
-        Log.v(tag(), getString(R.string.navigation_drawer_open))
+
     }
 
     fun createHeaderView(): View {
-        val llNavigationHeader = LayoutInflater.from(getActivity()).inflate(R.layout.list_header_main_navigation, null, false)
+        val llNavigationHeader = LayoutInflater.from(activity).inflate(R.layout.list_header_main_navigation, null, false)
 
         val ivAccountCover = llNavigationHeader.bindView<ImageView>(R.id.ivAccountCover)
-        Picasso.with(getActivity()).load("http://2.bp.blogspot.com/-6oNTuKj2y1I/VDW1uaZUu3I/AAAAAAAALDc/tJM0s5p1-5o/s1600/Untitled-1.jpg").into(ivAccountCover)
+        Picasso.with(activity).load("http://2.bp.blogspot.com/-6oNTuKj2y1I/VDW1uaZUu3I/AAAAAAAALDc/tJM0s5p1-5o/s1600/Untitled-1.jpg").into(ivAccountCover)
 
         tvAccountName = llNavigationHeader.bindView<TextView>(R.id.tvAccountName)
-        tvAccountName.setText(Preference.with(getActivity()).username ?: "N/A")
+        tvAccountName.text = Preference.with(activity).username ?: "N/A"
 
         val ibConfig = llNavigationHeader.bindView<ImageButton>(R.id.ibAccountConfig)
         ibConfig.setOnClickListener { view ->
diff --git a/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/view/fragment/MovieFragment.kt b/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/view/fragment/MovieFragment.kt
index 85f71d8..9a8ba37 100644
--- a/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/view/fragment/MovieFragment.kt
+++ b/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/view/fragment/MovieFragment.kt
@@ -1,15 +1,14 @@
 package com.taskworld.android.restfulandroidkotlin.view.fragment
 
-import com.taskworld.android.restfulandroidkotlin.R
-import kotlin.properties.Delegates
+import android.support.v4.app.Fragment
+import android.support.v4.app.FragmentManager
+import android.support.v4.app.FragmentPagerAdapter
 import android.support.v4.view.ViewPager
-import com.taskworld.android.restfulandroidkotlin.extension.bindView
 import android.view.View
-import android.support.v4.app.FragmentPagerAdapter
-import android.support.v4.app.FragmentManager
-import android.support.v4.app.Fragment
-import de.greenrobot.event.EventBus
+import com.taskworld.android.restfulandroidkotlin.R
 import com.taskworld.android.restfulandroidkotlin.event.OnToolbarTitleChangedEvent
+import com.taskworld.android.restfulandroidkotlin.extension.bindView
+import de.greenrobot.event.EventBus
 
 /**
  * Created by Kittinun Vantasin on 11/7/14.
@@ -19,13 +18,10 @@ class MovieFragment : BaseFragment() {
 
     override val mContentLayoutResourceId: Int = R.layout.fragment_movie
 
-    //widgets
-    val vpMovie by Delegates.lazy { getRootView().bindView<ViewPager>(R.id.vpMovie) }
-
     //data
     val mMovieCategories = listOf("now_playing", "top_rated")
 
-    class object {
+    companion object {
         fun newInstance(): MovieFragment {
             return MovieFragment()
         }
@@ -35,9 +31,10 @@ class MovieFragment : BaseFragment() {
     }
 
     override fun setUpUI(view: View) {
-        val pagerAdapter = MovieViewPagerAdapter(getChildFragmentManager())
-        vpMovie.setAdapter(pagerAdapter)
-        vpMovie.setOnPageChangeListener(object : ViewPager.SimpleOnPageChangeListener() {
+        val pagerAdapter = MovieViewPagerAdapter(childFragmentManager)
+        var vpMovie = getRootView().bindView<ViewPager>(R.id.vpMovie)
+        vpMovie.adapter = pagerAdapter
+        vpMovie.addOnPageChangeListener(object : ViewPager.SimpleOnPageChangeListener() {
             override fun onPageSelected(position: Int) {
                 EventBus.getDefault().post(OnToolbarTitleChangedEvent(pagerAdapter.getPageTitle(position).toString()))
             }
diff --git a/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/view/fragment/MovieGridFragment.kt b/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/view/fragment/MovieGridFragment.kt
index f4e828f..6237990 100644
--- a/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/view/fragment/MovieGridFragment.kt
+++ b/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/view/fragment/MovieGridFragment.kt
@@ -1,45 +1,34 @@
 package com.taskworld.android.restfulandroidkotlin.view.fragment
 
-import com.taskworld.android.restfulandroidkotlin.R
-import android.view.View
-import kotlin.properties.Delegates
-import com.taskworld.android.restfulandroidkotlin.extension.bindView
+import android.graphics.Rect
+import android.os.Bundle
+import android.support.v7.widget.LinearLayoutManager
 import android.support.v7.widget.RecyclerView
-import android.view.ViewGroup
-import android.widget.TextView
+import android.view.*
 import android.widget.ImageView
-import android.view.LayoutInflater
-import com.taskworld.android.restfulandroidkotlin.model.Movie
-import android.support.v7.widget.LinearLayoutManager
-import android.os.Bundle
+import android.widget.TextView
 import com.squareup.picasso.Picasso
-import android.graphics.Rect
-import android.view.Menu
-import android.view.MenuInflater
-import android.view.MenuItem
-import de.greenrobot.event.EventBus
+import com.taskworld.android.restfulandroidkotlin.R
 import com.taskworld.android.restfulandroidkotlin.event.OnMovieCategorySelectedEvent
 import com.taskworld.android.restfulandroidkotlin.event.OnToolbarTitleChangedEvent
-import android.util.Log
-import com.taskworld.android.restfulandroidkotlin.extension.tag
-import com.taskworld.android.restfulandroidkotlin.view.activity.MovieDetailActivity
+import com.taskworld.android.restfulandroidkotlin.extension.bindView
+import com.taskworld.android.restfulandroidkotlin.model.Movie
 import com.taskworld.android.restfulandroidkotlin.resource.client.ResourceClient
 import com.taskworld.android.restfulandroidkotlin.resource.router.ResourceRouterImpl
+import com.taskworld.android.restfulandroidkotlin.view.activity.MovieDetailActivity
+import de.greenrobot.event.EventBus
 import io.realm.Realm
+import kotlin.properties.Delegates
 
 /**
  * Created by Kittinun Vantasin on 11/6/14.
  */
-
 class MovieGridFragment : BaseSpiceFragment() {
 
     override val mContentLayoutResourceId: Int = R.layout.fragment_movie_grid
 
-    //widgets
-    val rvMovie by Delegates.lazy { getRootView().bindView<RecyclerView>(R.id.rvMovie) }
-
     //adapter
-    val mMovieAdapter by Delegates.lazy { MovieRecycleViewAdapter() }
+    val mMovieAdapter = MovieRecycleViewAdapter()
 
     //data
     var mItems by Delegates.observable(arrayListOf<Movie>(), { meta, oldItems, newItems ->
@@ -48,14 +37,14 @@ class MovieGridFragment : BaseSpiceFragment() {
     var mCategory = ""
     val mBus = EventBus()
 
-    class object {
+    companion object {
         val ARG_MOVIE_CATEGORY = "movie_category"
 
         fun newInstance(action: String): MovieGridFragment {
             val fragment = MovieGridFragment()
             val args = Bundle()
             args.putString(ARG_MOVIE_CATEGORY, action)
-            fragment.setArguments(args)
+            fragment.arguments = args
             return fragment
         }
     }
@@ -66,37 +55,38 @@ class MovieGridFragment : BaseSpiceFragment() {
     }
 
     override fun setUpUI(view: View) {
-        rvMovie.setLayoutManager(createLayoutManager())
+        val rvMovie = getRootView().bindView<RecyclerView>(R.id.rvMovie)
+        rvMovie.layoutManager = createLayoutManager()
         rvMovie.addItemDecoration(createItemDecoration())
-        //set adapter
-        rvMovie.setAdapter(mMovieAdapter)
+        rvMovie.adapter = mMovieAdapter
 
         val client = ResourceClient.Builder()
                 .setRouter(ResourceRouterImpl.newInstance(mCategory))
-                .setRealm(Realm.getInstance(getActivity()))
+                .setRealm(Realm.getInstance(activity))
                 .setEventBus(mBus)
                 .setSpiceManager(getServiceSpiceManager()).build()
 
-        client.findAll(javaClass<Movie>())
+        client.findAll(Movie::class.java)
     }
 
     override fun onCreateOptionsMenu(menu: Menu?, inflater: MenuInflater?) {
         inflater!!.inflate(R.menu.menu_grid_movie, menu)
-        super<BaseSpiceFragment>.onCreateOptionsMenu(menu, inflater)
+        super.onCreateOptionsMenu(menu, inflater)
     }
 
     override fun onOptionsItemSelected(item: MenuItem?): Boolean {
-        when (item?.getItemId()) {
-            R.id.miSearch -> Log.i(tag(), "search")
+        when (item?.itemId) {
+            R.id.miSearch -> {
+            }
             R.id.miAdd -> addMovie()
             R.id.miRemove -> removeMovie()
         }
-        return super<BaseSpiceFragment>.onOptionsItemSelected(item)
+        return super.onOptionsItemSelected(item)
     }
 
     override fun onDestroy() {
         mBus.unregister(this)
-        super<BaseSpiceFragment>.onDestroy()
+        super.onDestroy()
     }
 
     override fun handleArguments(args: Bundle) {
@@ -104,7 +94,7 @@ class MovieGridFragment : BaseSpiceFragment() {
     }
 
     fun onEvent(items: Movie.ResultList) {
-        mItems = items.getResults().toArrayList()
+        mItems = items.results.toArrayList()
     }
 
     fun onEvent(event: OnMovieCategorySelectedEvent) {
@@ -113,7 +103,7 @@ class MovieGridFragment : BaseSpiceFragment() {
     }
 
     fun createLayoutManager(): RecyclerView.LayoutManager {
-        return LinearLayoutManager(getActivity(), LinearLayoutManager.VERTICAL, false)
+        return LinearLayoutManager(activity, LinearLayoutManager.VERTICAL, false)
     }
 
     fun createItemDecoration(): RecyclerView.ItemDecoration {
@@ -123,36 +113,36 @@ class MovieGridFragment : BaseSpiceFragment() {
     fun addMovie() {
         var m = Movie()
 
-        m.setTitle("My new movie")
-        m.setPosterPath("/aJemoN7F9GrAYjIL94KXww3QWP9.jpg")
-        m.setPopularity((Math.random() * 100).toFloat())
+        m.title = "My new movie"
+        m.posterPath = "/aJemoN7F9GrAYjIL94KXww3QWP9.jpg"
+        m.popularity = (Math.random() * 100).toFloat()
 
         mItems.add(1, m)
         mMovieAdapter.notifyItemInserted(1)
     }
 
     fun removeMovie() {
-        mItems.remove(0)
+        mItems.removeAt(0)
         mMovieAdapter.notifyItemRemoved(0)
     }
 
     fun onItemClick(position: Int) {
         val movie = mItems[position]
-        startActivity(MovieDetailActivity.newIntent(getActivity(), movie.getId()))
+        startActivity(MovieDetailActivity.newIntent(activity, movie.id))
     }
 
     inner class MovieRecycleViewAdapter : RecyclerView.Adapter<MovieRecycleViewAdapter.MovieViewHolder>() {
 
         override fun onCreateViewHolder(container: ViewGroup?, viewType: Int): MovieViewHolder? {
-            val view = LayoutInflater.from(container?.getContext()).inflate(R.layout.recycle_view_item_movie, container, false)
+            val view = LayoutInflater.from(container?.context).inflate(R.layout.recycle_view_item_movie, container, false)
             return MovieViewHolder(view)
         }
 
         override fun onBindViewHolder(viewHolder: MovieViewHolder, position: Int) {
             val m = mItems[position]
-            viewHolder.tvMovieTitle.setText(m.getTitle())
-            viewHolder.tvMoviePopularScore.setText(m.getPopularity().toString())
-            Picasso.with(getActivity()).load("https://image.tmdb.org/t/p/w500/" + m.getPosterPath()).into(viewHolder.ivMovieCover)
+            viewHolder.tvMovieTitle.text = m.title
+            viewHolder.tvMoviePopularScore.text = m.popularity.toString()
+            Picasso.with(activity).load("https://image.tmdb.org/t/p/w500/" + m.posterPath).into(viewHolder.ivMovieCover)
         }
 
         override fun getItemCount(): Int {
@@ -160,13 +150,13 @@ class MovieGridFragment : BaseSpiceFragment() {
         }
 
         inner class MovieViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-            {
-                itemView.setOnClickListener { view -> onItemClick(getPosition()) }
+            init {
+                itemView.setOnClickListener { view -> onItemClick(adapterPosition) }
             }
 
-            val tvMovieTitle by Delegates.lazy { itemView.bindView<TextView>(R.id.tvMovieTitle) }
-            val tvMoviePopularScore by Delegates.lazy { itemView.bindView<TextView>(R.id.tvMoviePopularScore) }
-            val ivMovieCover by Delegates.lazy { itemView.bindView<ImageView>(R.id.ivMovieCover) }
+            val tvMovieTitle = itemView.bindView<TextView>(R.id.tvMovieTitle)
+            val tvMoviePopularScore = itemView.bindView<TextView>(R.id.tvMoviePopularScore)
+            val ivMovieCover = itemView.bindView<ImageView>(R.id.ivMovieCover)
         }
     }
 
diff --git a/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/view/fragment/TVFragment.kt b/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/view/fragment/TVFragment.kt
index 888ae56..434c526 100644
--- a/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/view/fragment/TVFragment.kt
+++ b/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/view/fragment/TVFragment.kt
@@ -1,33 +1,28 @@
 package com.taskworld.android.restfulandroidkotlin.view.fragment
 
-import com.taskworld.android.restfulandroidkotlin.R
-import kotlin.properties.Delegates
-import com.taskworld.android.restfulandroidkotlin.extension.bindView
-import android.support.v4.view.ViewPager
-import android.support.v4.app.FragmentPagerAdapter
-import android.support.v4.app.FragmentManager
 import android.support.v4.app.Fragment
+import android.support.v4.app.FragmentManager
+import android.support.v4.app.FragmentPagerAdapter
+import android.support.v4.view.ViewPager
 import android.view.View
-import de.greenrobot.event.EventBus
+import com.taskworld.android.restfulandroidkotlin.R
 import com.taskworld.android.restfulandroidkotlin.event.OnToolbarTitleChangedEvent
+import com.taskworld.android.restfulandroidkotlin.extension.bindView
+import de.greenrobot.event.EventBus
 
 /**
  * Created by Kittinun Vantasin on 11/7/14.
  */
-
 class TVFragment : BaseFragment() {
 
     override val mContentLayoutResourceId: Int = R.layout.fragment_tv
 
-    //widgets
-    val vpTV by Delegates.lazy { getRootView().bindView<ViewPager>(R.id.vpTV) }
-
     //data
     val mTVCategories = listOf("airing_today", "popular")
 
-    class object {
+    companion object {
         fun newInstance(): TVFragment {
-           return TVFragment()
+            return TVFragment()
         }
     }
 
@@ -35,9 +30,10 @@ class TVFragment : BaseFragment() {
     }
 
     override fun setUpUI(view: View) {
-        val pagerAdapter = TVViewPagerAdapter(getChildFragmentManager())
-        vpTV.setAdapter(pagerAdapter)
-        vpTV.setOnPageChangeListener(object : ViewPager.SimpleOnPageChangeListener() {
+        val pagerAdapter = TVViewPagerAdapter(childFragmentManager)
+        val vpTV = getRootView().bindView<ViewPager>(R.id.vpTV)
+        vpTV.adapter = pagerAdapter
+        vpTV.addOnPageChangeListener(object : ViewPager.SimpleOnPageChangeListener() {
             override fun onPageSelected(position: Int) {
                 EventBus.getDefault().post(OnToolbarTitleChangedEvent(pagerAdapter.getPageTitle(position).toString()))
             }
diff --git a/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/view/fragment/TVGridFragment.kt b/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/view/fragment/TVGridFragment.kt
index 78339b8..0e2b830 100644
--- a/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/view/fragment/TVGridFragment.kt
+++ b/app/src/main/kotlin/com/taskworld/android/restfulandroidkotlin/view/fragment/TVGridFragment.kt
@@ -1,38 +1,34 @@
 package com.taskworld.android.restfulandroidkotlin.view.fragment
 
-import com.taskworld.android.restfulandroidkotlin.R
 import android.os.Bundle
-import android.view.View
-import kotlin.properties.Delegates
-import com.taskworld.android.restfulandroidkotlin.extension.bindView
-import de.greenrobot.event.EventBus
+import android.support.v7.widget.GridLayoutManager
 import android.support.v7.widget.RecyclerView
+import android.view.LayoutInflater
+import android.view.View
 import android.view.ViewGroup
-import com.taskworld.android.restfulandroidkotlin.model.TV
-import android.widget.TextView
 import android.widget.ImageView
-import android.view.LayoutInflater
+import android.widget.TextView
 import com.squareup.picasso.Picasso
-import android.support.v7.widget.GridLayoutManager
-import java.text.SimpleDateFormat
+import com.taskworld.android.restfulandroidkotlin.R
+import com.taskworld.android.restfulandroidkotlin.extension.bindView
+import com.taskworld.android.restfulandroidkotlin.extension.toast
+import com.taskworld.android.restfulandroidkotlin.model.TV
 import com.taskworld.android.restfulandroidkotlin.resource.client.ResourceClient
 import com.taskworld.android.restfulandroidkotlin.resource.router.ResourceRouterImpl
+import de.greenrobot.event.EventBus
 import io.realm.Realm
-import com.taskworld.android.restfulandroidkotlin.extension.toast
+import java.text.SimpleDateFormat
+import kotlin.properties.Delegates
 
 /**
  * Created by Kittinun Vantasin on 11/7/14.
  */
-
 class TVGridFragment : BaseSpiceFragment() {
 
     override val mContentLayoutResourceId: Int = R.layout.fragment_tv_grid
 
-    //widgets
-    val rvTV by Delegates.lazy { getRootView().bindView<RecyclerView>(R.id.rvTV) }
-
     //adapter
-    val mTVAdapter by Delegates.lazy { TVRecyclerViewAdapter() }
+    val mTVAdapter = TVRecyclerViewAdapter()
 
     //data
     var mItems by Delegates.observable(arrayListOf<TV>(), { meta, oldItems, newItems ->
@@ -41,14 +37,14 @@ class TVGridFragment : BaseSpiceFragment() {
     var mCategory = ""
     val mBus = EventBus()
 
-    class object {
+    companion object {
         val ARG_TV_CATEGORY = "tv_category"
 
         fun newInstance(category: String): TVGridFragment {
             val fragment = TVGridFragment()
             var args = Bundle()
             args.putString(ARG_TV_CATEGORY, category)
-            fragment.setArguments(args)
+            fragment.arguments = args
             return fragment
         }
     }
@@ -58,17 +54,17 @@ class TVGridFragment : BaseSpiceFragment() {
     }
 
     override fun setUpUI(view: View) {
-        rvTV.setLayoutManager(createLayoutManager())
-        //set adapter
-        rvTV.setAdapter(mTVAdapter)
+        val rvTV = getRootView().bindView<RecyclerView>(R.id.rvTV)
+        rvTV.layoutManager = createLayoutManager()
+        rvTV.adapter = mTVAdapter
 
         val client = ResourceClient.Builder()
                 .setRouter(ResourceRouterImpl.newInstance(mCategory))
-                .setRealm(Realm.getInstance(getActivity()))
+                .setRealm(Realm.getInstance(activity))
                 .setEventBus(mBus)
                 .setSpiceManager(getServiceSpiceManager()).build()
 
-        client.findAll(javaClass<TV>())
+        client.findAll(TV::class.java)
     }
 
     override fun handleArguments(args: Bundle) {
@@ -76,36 +72,36 @@ class TVGridFragment : BaseSpiceFragment() {
     }
 
     fun onEvent(items: TV.ResultList) {
-        mItems = items.getResults().toArrayList()
+        mItems = items.results.toArrayList()
     }
 
     fun createLayoutManager(): RecyclerView.LayoutManager {
-        return GridLayoutManager(getActivity(), 2)
+        return GridLayoutManager(activity, 2)
     }
 
     override fun onDestroy() {
         mBus.unregister(this)
-        super<BaseSpiceFragment>.onDestroy()
+        super.onDestroy()
     }
 
     fun onItemClick(position: Int) {
         val tv = mItems[position]
-        toast(tv.getName())
+        toast(tv.name)
     }
 
     inner class TVRecyclerViewAdapter : RecyclerView.Adapter<TVRecyclerViewAdapter.TVViewHolder>() {
 
         override fun onCreateViewHolder(container: ViewGroup?, position: Int): TVViewHolder? {
-            val view = LayoutInflater.from(container?.getContext()).inflate(R.layout.recycle_view_item_tv, container, false)
+            val view = LayoutInflater.from(container?.context).inflate(R.layout.recycle_view_item_tv, container, false)
             return TVViewHolder(view)
         }
 
         override fun onBindViewHolder(viewHolder: TVViewHolder, position: Int) {
             val tv = mItems[position]
-            viewHolder.tvTVTitle.setText(tv.getName())
+            viewHolder.tvTVTitle.text = tv.name
             val formatter = SimpleDateFormat("dd MMM yyyy")
-            viewHolder.tvTVFirstAirDate.setText(formatter.format(tv.getFirstAirDate()))
-            Picasso.with(getActivity()).load("https://image.tmdb.org/t/p/w500/" + tv.getPosterPath()).into(viewHolder.ivTVCover)
+            viewHolder.tvTVFirstAirDate.text = formatter.format(tv.firstAirDate)
+            Picasso.with(activity).load("https://image.tmdb.org/t/p/w500/" + tv.posterPath).into(viewHolder.ivTVCover)
         }
 
         override fun getItemCount(): Int {
@@ -113,13 +109,13 @@ class TVGridFragment : BaseSpiceFragment() {
         }
 
         inner class TVViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-            {
-                itemView.setOnClickListener { view -> onItemClick(getPosition()) }
+            init {
+                itemView.setOnClickListener { view -> onItemClick(adapterPosition) }
             }
 
-            val tvTVTitle by Delegates.lazy { itemView.bindView<TextView>(R.id.tvTVTitle) }
-            val tvTVFirstAirDate by Delegates.lazy { itemView.bindView<TextView>(R.id.tvTVFirstAirDate) }
-            val ivTVCover by Delegates.lazy { itemView.bindView<ImageView>(R.id.ivTVCover) }
+            val tvTVTitle = itemView.bindView<TextView>(R.id.tvTVTitle)
+            val tvTVFirstAirDate = itemView.bindView<TextView>(R.id.tvTVFirstAirDate)
+            val ivTVCover = itemView.bindView<ImageView>(R.id.ivTVCover)
         }
     }
 }
diff --git a/app/src/main/res/drawable/tool_bar_background.9.png b/app/src/main/res/drawable/tool_bar_background.9.png
deleted file mode 100755
index 29e6b03..0000000
Binary files a/app/src/main/res/drawable/tool_bar_background.9.png and /dev/null differ
diff --git a/app/src/main/res/layout/activity_movie_detail.xml b/app/src/main/res/layout/activity_movie_detail.xml
index 9beeb32..4029e58 100644
--- a/app/src/main/res/layout/activity_movie_detail.xml
+++ b/app/src/main/res/layout/activity_movie_detail.xml
@@ -14,7 +14,7 @@
         android:layout_height="wrap_content"
         android:layout_width="match_parent"
         android:minHeight="?attr/actionBarSize"
-        android:background="@drawable/tool_bar_background">
+        android:background="@color/orange">
 
         <TextView
             android:id="@+id/tvBarTitle"
diff --git a/app/src/main/res/menu/menu_edit_product.xml b/app/src/main/res/menu/menu_edit_product.xml
index da502f2..198a746 100644
--- a/app/src/main/res/menu/menu_edit_product.xml
+++ b/app/src/main/res/menu/menu_edit_product.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item android:id="@+id/miSave"
           android:title="Save"
-          android:showAsAction="always" />
+          app:showAsAction="always" />
 
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_grid_movie.xml b/app/src/main/res/menu/menu_grid_movie.xml
index db0c2ea..09e9d2e 100644
--- a/app/src/main/res/menu/menu_grid_movie.xml
+++ b/app/src/main/res/menu/menu_grid_movie.xml
@@ -4,7 +4,7 @@
 
     <item android:id="@+id/miSearch"
           android:title="Search"
-          app:showAsAction="always" />
+          app:showAsAction="ifRoom" />
 
     <item android:id="@+id/miAdd"
           android:title="Add"
diff --git a/app/src/main/res/menu/menu_list_product.xml b/app/src/main/res/menu/menu_list_product.xml
index 825152b..44f3557 100644
--- a/app/src/main/res/menu/menu_list_product.xml
+++ b/app/src/main/res/menu/menu_list_product.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item android:id="@+id/miAddProduct"
           android:title="Add"
-          android:showAsAction="always" />
+          app:showAsAction="ifRoom" />
 
     <item android:id="@+id/miDeleteAll"
           android:title="Delete All"
-          android:showAsAction="always" />
+          app:showAsAction="ifRoom" />
 </menu>
diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml
index 87a750e..cc59793 100644
--- a/app/src/main/res/menu/menu_main.xml
+++ b/app/src/main/res/menu/menu_main.xml
@@ -1,5 +1,10 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools" tools:context=".MainActivity">
-    <item android:id="@+id/action_settings" android:title="@string/action_settings"
-        android:orderInCategory="100" android:showAsAction="never" />
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:context=".MainActivity">
+    <item
+        android:id="@+id/action_settings"
+        android:orderInCategory="100"
+        app:showAsAction="never"
+        android:title="@string/action_settings" />
 </menu>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
new file mode 100644
index 0000000..b48207f
--- /dev/null
+++ b/app/src/main/res/values/colors.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="orange">#ff8800</color>
+</resources>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 5b75030..dfdb72f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.14.0'
+        classpath 'com.android.tools.build:gradle:1.2.3'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
@@ -16,3 +16,17 @@ allprojects {
         jcenter()
     }
 }
+
+// Disable Pre-dexing when build in CI server (http://tools.android.com/tech-docs/new-build-system/tips#TOC-Improving-Build-Server-performance)
+project.ext.preDexLibs = !project.hasProperty('disablePreDex')
+
+subprojects {
+    project.plugins.whenPluginAdded { plugin ->
+        if ("com.android.build.gradle.AppPlugin".equals(plugin.class.name)) {
+            project.android.dexOptions.preDexLibraries = rootProject.ext.preDexLibs
+        } else if ("com.android.build.gradle.LibraryPlugin".equals(plugin.class.name)) {
+            project.android.dexOptions.preDexLibraries = rootProject.ext.preDexLibs
+        }
+    }
+}
+
diff --git a/circle.yml b/circle.yml
new file mode 100644
index 0000000..cefe9cc
--- /dev/null
+++ b/circle.yml
@@ -0,0 +1,6 @@
+dependencies:
+    pre:
+        - echo y | android update sdk --no-ui --all --filter sys-img-armeabi-v7a-addon-google_apis-google-21,addon-google_apis-google-21
+test:
+    override:
+        - ./gradlew clean assemble -PdisablePreDex
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index ffaa281..adcf11d 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Apr 10 15:27:10 PDT 2013
+#Wed Jun 24 16:46:18 ICT 2015
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-all.zip
diff --git a/install-sdk.sh b/install-sdk.sh
new file mode 100644
index 0000000..6ce92fa
--- /dev/null
+++ b/install-sdk.sh
@@ -0,0 +1,29 @@
+#!/bin/bash
+
+# Fix the CircleCI path
+export PATH="$ANDROID_HOME/platform-tools:$ANDROID_HOME/tools:$PATH"
+
+DEPS="$ANDROID_HOME/installed-dependencies"
+
+if [ ! -e $DEPS ]; then
+    #Install SDK Components
+    echo y | android update sdk -u -a -t tools &&
+    echo y | android update sdk -u -a -t platform-tools &&
+    echo y | android update sdk -u -a -t build-tools-21.1.2 &&
+    echo y | android update sdk -u -a -t sys-img-armeabi-v7a-android-21 &&
+    echo y | android update sdk -u -a -t sys-img-x86_64-android-21 &&
+    echo y | android update sdk -u -a -t sys-img-x86-android-19 &&
+    echo y | android update sdk -u -a -t android-21 &&
+    echo y | android update sdk -u -a -t android-19 &&
+    echo y | android update sdk -u -a -t addon-google_apis-google-21 &&
+    echo y | android update sdk -u -a -t addon-google_apis-google-19 &&
+    echo y | android update sdk -u -a -t addon-google_apis_x86-google-19 &&
+    echo y | android update sdk -u -a -t extra-android-m2repository &&
+    echo y | android update sdk -u -a -t extra-android-support &&
+    echo y | android update sdk -u -a -t extra-google-m2repository &&
+    echo y | android update sdk -u -a -t extra-google-google_play_services &&
+    echo y | android update sdk -u -a -t extra-intel-Hardware_Accelerated_Execution_Manager &&
+    #Create AVD for Unit Testing
+    echo n | android create avd -n avd-test-19 -f -t android-19 -b default/x86 &&
+    touch $DEPS
+fi
\ No newline at end of file