diff --git a/app/src/main/java/com/support/android/designlibdemo/CheeseDetailActivity.java b/app/src/main/java/com/support/android/designlibdemo/CheeseDetailActivity.java
index 4169f8c..fa9eb99 100644
--- a/app/src/main/java/com/support/android/designlibdemo/CheeseDetailActivity.java
+++ b/app/src/main/java/com/support/android/designlibdemo/CheeseDetailActivity.java
@@ -40,12 +40,11 @@ public void onCreate(Bundle savedInstanceState) {
         Intent intent = getIntent();
         final String cheeseName = intent.getStringExtra(EXTRA_NAME);
 
-        final Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+        final Toolbar toolbar = findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
-        CollapsingToolbarLayout collapsingToolbar =
-                (CollapsingToolbarLayout) findViewById(R.id.collapsing_toolbar);
+        CollapsingToolbarLayout collapsingToolbar = findViewById(R.id.collapsing_toolbar);
         collapsingToolbar.setTitle(cheeseName);
 
         loadBackdrop();
@@ -54,7 +53,7 @@ public void onCreate(Bundle savedInstanceState) {
     }
 
     private void loadBackdrop() {
-        final ImageView imageView = (ImageView) findViewById(R.id.backdrop);
+        final ImageView imageView = findViewById(R.id.backdrop);
         Glide.with(this).load(Cheeses.getRandomCheeseDrawable()).centerCrop().into(imageView);
     }
 
diff --git a/app/src/main/java/com/support/android/designlibdemo/CheeseListFragment.java b/app/src/main/java/com/support/android/designlibdemo/CheeseListFragment.java
index fdf9452..ca4a518 100644
--- a/app/src/main/java/com/support/android/designlibdemo/CheeseListFragment.java
+++ b/app/src/main/java/com/support/android/designlibdemo/CheeseListFragment.java
@@ -80,8 +80,8 @@ public static class ViewHolder extends RecyclerView.ViewHolder {
             public ViewHolder(View view) {
                 super(view);
                 mView = view;
-                mImageView = (ImageView) view.findViewById(R.id.avatar);
-                mTextView = (TextView) view.findViewById(android.R.id.text1);
+                mImageView = view.findViewById(R.id.avatar);
+                mTextView = view.findViewById(android.R.id.text1);
             }
 
             @Override
diff --git a/app/src/main/java/com/support/android/designlibdemo/MainActivity.java b/app/src/main/java/com/support/android/designlibdemo/MainActivity.java
index 79cb9f1..3c04598 100644
--- a/app/src/main/java/com/support/android/designlibdemo/MainActivity.java
+++ b/app/src/main/java/com/support/android/designlibdemo/MainActivity.java
@@ -50,26 +50,26 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
 
-        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+        Toolbar toolbar = findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
 
         final ActionBar ab = getSupportActionBar();
         ab.setHomeAsUpIndicator(R.drawable.ic_menu);
         ab.setDisplayHomeAsUpEnabled(true);
 
-        mDrawerLayout = (DrawerLayout) findViewById(R.id.drawer_layout);
+        mDrawerLayout = findViewById(R.id.drawer_layout);
 
-        NavigationView navigationView = (NavigationView) findViewById(R.id.nav_view);
+        NavigationView navigationView = findViewById(R.id.nav_view);
         if (navigationView != null) {
             setupDrawerContent(navigationView);
         }
 
-        ViewPager viewPager = (ViewPager) findViewById(R.id.viewpager);
+        ViewPager viewPager = findViewById(R.id.viewpager);
         if (viewPager != null) {
             setupViewPager(viewPager);
         }
 
-        FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab);
+        FloatingActionButton fab = findViewById(R.id.fab);
         fab.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
@@ -78,7 +78,7 @@ public void onClick(View view) {
             }
         });
 
-        TabLayout tabLayout = (TabLayout) findViewById(R.id.tabs);
+        TabLayout tabLayout = findViewById(R.id.tabs);
         tabLayout.setupWithViewPager(viewPager);
 
         nightModeUtils = NightModeUtils.from(this);
diff --git a/app/src/main/java/com/support/android/designlibdemo/NightModeUtils.java b/app/src/main/java/com/support/android/designlibdemo/NightModeUtils.java
index 7347708..99aece2 100644
--- a/app/src/main/java/com/support/android/designlibdemo/NightModeUtils.java
+++ b/app/src/main/java/com/support/android/designlibdemo/NightModeUtils.java
@@ -1,7 +1,6 @@
 package com.support.android.designlibdemo;
 
 import android.app.Activity;
-import android.os.Build;
 import android.support.annotation.NonNull;
 import android.support.v7.app.AppCompatDelegate;
 import android.view.Menu;
@@ -38,7 +37,7 @@ boolean checkNightMode(@NonNull Menu menu) {
         return true;
     }
 
-    public boolean onNightModeItemSelected(@NonNull MenuItem item) {
+    boolean onNightModeItemSelected(@NonNull MenuItem item) {
         switch (item.getItemId()) {
             case R.id.menu_night_mode_system:
                 setNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM);
@@ -61,9 +60,6 @@ public boolean onNightModeItemSelected(@NonNull MenuItem item) {
     private void setNightMode(@AppCompatDelegate.NightMode int nightMode) {
         AppCompatDelegate.setDefaultNightMode(nightMode);
 
-        if (Build.VERSION.SDK_INT >= 11) {
-            activity.recreate();
-        }
+        activity.recreate();
     }
-
 }