diff --git a/app/src/main/java/com/example/yink/amadeus/AlarmActivity.java b/app/src/main/java/com/example/yink/amadeus/AlarmActivity.java
index 1057679..93736d7 100644
--- a/app/src/main/java/com/example/yink/amadeus/AlarmActivity.java
+++ b/app/src/main/java/com/example/yink/amadeus/AlarmActivity.java
@@ -69,7 +69,7 @@ public class AlarmActivity extends Activity {
     }
 
     @SuppressWarnings("deprecation")
-    public void setTimeLegacy(Calendar calendar) {
+    private void setTimeLegacy(Calendar calendar) {
         calendar.set(Calendar.HOUR_OF_DAY, alarmTimePicker.getCurrentHour());
         calendar.set(Calendar.MINUTE, alarmTimePicker.getCurrentHour());
         alarmManager.set(AlarmManager.RTC_WAKEUP, calendar.getTimeInMillis(), pendingIntent);
@@ -77,7 +77,7 @@ public class AlarmActivity extends Activity {
     }
 
     @TargetApi(Build.VERSION_CODES.M)
-    public void setTime(Calendar calendar) {
+    private void setTime(Calendar calendar) {
         calendar.set(Calendar.HOUR_OF_DAY, alarmTimePicker.getHour());
         calendar.set(Calendar.MINUTE, alarmTimePicker.getMinute());
         alarmManager.setAndAllowWhileIdle(AlarmManager.RTC_WAKEUP, calendar.getTimeInMillis(), pendingIntent);
diff --git a/app/src/main/java/com/example/yink/amadeus/AlarmService.java b/app/src/main/java/com/example/yink/amadeus/AlarmService.java
index ad6d593..ff77903 100644
--- a/app/src/main/java/com/example/yink/amadeus/AlarmService.java
+++ b/app/src/main/java/com/example/yink/amadeus/AlarmService.java
@@ -16,7 +16,7 @@ public class AlarmService extends IntentService {
     }
 
     @Override
-    public void onHandleIntent(Intent intent) {
+    protected void onHandleIntent(Intent intent) {
         sendNotification(getString(R.string.incoming_call));
         Intent launch = new Intent(this, LaunchActivity.class);
         startActivity(launch);
diff --git a/app/src/main/java/com/example/yink/amadeus/LangContext.java b/app/src/main/java/com/example/yink/amadeus/LangContext.java
index 2c496e0..6e3fd7d 100644
--- a/app/src/main/java/com/example/yink/amadeus/LangContext.java
+++ b/app/src/main/java/com/example/yink/amadeus/LangContext.java
@@ -63,12 +63,12 @@ public class LangContext extends ContextWrapper {
     }
 
     @SuppressWarnings("deprecation")
-    public static void setSystemLocaleLegacy(Configuration config, Locale locale){
+    private static void setSystemLocaleLegacy(Configuration config, Locale locale){
         config.locale = locale;
     }
 
     @TargetApi(Build.VERSION_CODES.N)
-    public static void setSystemLocale(Configuration config, Locale locale){
+    private static void setSystemLocale(Configuration config, Locale locale){
         config.setLocale(locale);
     }
 }
diff --git a/app/src/main/java/com/example/yink/amadeus/LaunchActivity.java b/app/src/main/java/com/example/yink/amadeus/LaunchActivity.java
index 63e2458..7b394a4 100644
--- a/app/src/main/java/com/example/yink/amadeus/LaunchActivity.java
+++ b/app/src/main/java/com/example/yink/amadeus/LaunchActivity.java
@@ -48,7 +48,7 @@ public class LaunchActivity extends AppCompatActivity {
         }
     };
 
-    private static boolean isAppInstalled(Context context, String packageName) {
+    private boolean isAppInstalled(Context context, String packageName) {
         try {
             context.getPackageManager().getApplicationInfo(packageName, 0);
             return true;
diff --git a/app/src/main/java/com/example/yink/amadeus/MainActivity.java b/app/src/main/java/com/example/yink/amadeus/MainActivity.java
index 725e4e3..acb01bb 100644
--- a/app/src/main/java/com/example/yink/amadeus/MainActivity.java
+++ b/app/src/main/java/com/example/yink/amadeus/MainActivity.java
@@ -195,7 +195,7 @@ public class MainActivity extends AppCompatActivity {
         }
     }
 
-    public void speak(VoiceLine line) {
+    private void speak(VoiceLine line) {
         try {
             m = MediaPlayer.create(getApplicationContext(), line.getId());
             final Visualizer v = new Visualizer(m.getAudioSessionId());
diff --git a/app/src/main/java/com/example/yink/amadeus/SettingsActivity.java b/app/src/main/java/com/example/yink/amadeus/SettingsActivity.java
index f3bac3d..17f4490 100644
--- a/app/src/main/java/com/example/yink/amadeus/SettingsActivity.java
+++ b/app/src/main/java/com/example/yink/amadeus/SettingsActivity.java
@@ -5,10 +5,8 @@ package com.example.yink.amadeus;
  */
 
 import android.content.Context;
-import android.content.SharedPreferences;
 import android.os.Build;
 import android.os.Bundle;
-import android.preference.PreferenceManager;
 import android.support.v4.app.FragmentActivity;
 
 public class SettingsActivity extends FragmentActivity {