diff --git a/app/src/main/java/com/philliphsu/clock2/editalarm/BaseTimePickerDialog.java b/app/src/main/java/com/philliphsu/clock2/editalarm/BaseTimePickerDialog.java
index 5604d96..806e478 100644
--- a/app/src/main/java/com/philliphsu/clock2/editalarm/BaseTimePickerDialog.java
+++ b/app/src/main/java/com/philliphsu/clock2/editalarm/BaseTimePickerDialog.java
@@ -16,9 +16,7 @@ import butterknife.ButterKnife;
 public abstract class BaseTimePickerDialog extends BottomSheetDialogFragment {
     private static final String TAG = "BaseTimePickerDialog";
 
-    // TODO: Consider private access, and then writing package/protected API that subclasses
-    // can use to interface with this field.
-    /*package*/ OnTimeSetListener mCallback;
+    private OnTimeSetListener mCallback;
 
     /**
      * The callback interface used to indicate the user is done filling in
@@ -75,6 +73,13 @@ public abstract class BaseTimePickerDialog extends BottomSheetDialogFragment {
         return view;
     }
 
+    protected final void onTimeSet(ViewGroup vg, int hourOfDay, int minute) {
+        if (mCallback != null) {
+            mCallback.onTimeSet(vg, hourOfDay, minute);
+        }
+        dismiss();
+    }
+
 //    @Override
 //    public void onResume() {
 //        super.onResume();
diff --git a/app/src/main/java/com/philliphsu/clock2/editalarm/NumberGridTimePickerDialog.java b/app/src/main/java/com/philliphsu/clock2/editalarm/NumberGridTimePickerDialog.java
index 62c0489..fe10a16 100644
--- a/app/src/main/java/com/philliphsu/clock2/editalarm/NumberGridTimePickerDialog.java
+++ b/app/src/main/java/com/philliphsu/clock2/editalarm/NumberGridTimePickerDialog.java
@@ -237,8 +237,7 @@ public class NumberGridTimePickerDialog extends BaseTimePickerDialog implements
 
     public void initialize(OnTimeSetListener callback,
             int hourOfDay, int minute, boolean is24HourMode) {
-        mCallback = callback; // TODO: Use setOnTimeSetListener() instead?
-
+        setOnTimeSetListener(callback);
         mInitialHourOfDay = hourOfDay;
         mInitialMinute = minute;
         mIs24HourMode = is24HourMode;
@@ -390,11 +389,7 @@ public class NumberGridTimePickerDialog extends BaseTimePickerDialog implements
                 } else {
                     tryVibrate();
                 }
-                if (mCallback != null) {
-//                    Log.d(TAG, String.format("Time set: %d:%02d", mTimePicker.getHours(), mTimePicker.getMinutes()));
-                    mCallback.onTimeSet(mTimePicker, mTimePicker.getHours(), mTimePicker.getMinutes());
-                }
-                dismiss();
+                onTimeSet(mTimePicker, mTimePicker.getHours(), mTimePicker.getMinutes());
             }
         });
 //        mDoneButton.setOnKeyListener(keyboardListener);
diff --git a/app/src/main/java/com/philliphsu/clock2/editalarm/NumpadTimePickerDialog.java b/app/src/main/java/com/philliphsu/clock2/editalarm/NumpadTimePickerDialog.java
index 89da93c..7c33e94 100644
--- a/app/src/main/java/com/philliphsu/clock2/editalarm/NumpadTimePickerDialog.java
+++ b/app/src/main/java/com/philliphsu/clock2/editalarm/NumpadTimePickerDialog.java
@@ -65,7 +65,7 @@ public class NumpadTimePickerDialog extends BaseTimePickerDialog
     @Deprecated
     public void initialize(OnTimeSetListener callback,
                            int hourOfDay, int minute, boolean is24HourMode) {
-        mCallback = callback;
+        setOnTimeSetListener(callback);
         mIs24HourMode = is24HourMode;
     }
 
@@ -170,9 +170,7 @@ public class NumpadTimePickerDialog extends BaseTimePickerDialog
     void confirmSelection() {
         if (!mNumpad.checkTimeValid())
             return;
-//        Log.d(TAG, String.format("Time set: %d:%02d", mNumpad.getHour(), mNumpad.getMinute()));
-        mCallback.onTimeSet(mNumpad, mNumpad.getHour(), mNumpad.getMinute());
-        dismiss();
+        onTimeSet(mNumpad, mNumpad.getHour(), mNumpad.getMinute());
     }
 
     private void updateInputText(String inputText) {