diff --git a/astrid/plugin-src/com/todoroo/astrid/calls/MissedCallActivity.java b/astrid/plugin-src/com/todoroo/astrid/calls/MissedCallActivity.java
index 784ed6c47..69e737379 100644
--- a/astrid/plugin-src/com/todoroo/astrid/calls/MissedCallActivity.java
+++ b/astrid/plugin-src/com/todoroo/astrid/calls/MissedCallActivity.java
@@ -40,6 +40,9 @@ public class MissedCallActivity extends Activity {
 
     private static final String PREF_IGNORE_PRESSES = "missedCallsIgnored"; //$NON-NLS-1$
 
+    // Prompt user to ignore all missed calls after this many ignore presses
+    private static final int IGNORE_PROMPT_COUNT = 3;
+
     @Autowired private TaskService taskService;
 
     private final OnClickListener dismissListener = new OnClickListener() {
@@ -56,7 +59,7 @@ public class MissedCallActivity extends Activity {
             // Check for number of ignore presses
             int ignorePresses = Preferences.getInt(PREF_IGNORE_PRESSES, 0);
             ignorePresses++;
-            if (ignorePresses % 3 == 0) {
+            if (ignorePresses == IGNORE_PROMPT_COUNT) {
                 DialogUtilities.okCancelCustomDialog(MissedCallActivity.this,
                         getString(R.string.MCA_ignore_title),
                         getString(R.string.MCA_ignore_body),
diff --git a/astrid/plugin-src/com/todoroo/astrid/calls/PhoneStateChangedReceiver.java b/astrid/plugin-src/com/todoroo/astrid/calls/PhoneStateChangedReceiver.java
index 4063de6d1..8f2e56a0e 100644
--- a/astrid/plugin-src/com/todoroo/astrid/calls/PhoneStateChangedReceiver.java
+++ b/astrid/plugin-src/com/todoroo/astrid/calls/PhoneStateChangedReceiver.java
@@ -22,6 +22,8 @@ public class PhoneStateChangedReceiver extends BroadcastReceiver {
 
     private static final String PREF_LAST_INCOMING_NUMBER = "last_incoming_number";
 
+    private static final long WAIT_BEFORE_READ_LOG = 3000L;
+
     @Override
     public void onReceive(final Context context, Intent intent) {
         if (!Preferences.getBoolean(R.string.p_field_missed_calls, true)) {
@@ -40,7 +42,6 @@ public class PhoneStateChangedReceiver extends BroadcastReceiver {
         } else if (TelephonyManager.EXTRA_STATE_IDLE.equals(state)) {
             final String lastNumber = Preferences.getStringValue(PREF_LAST_INCOMING_NUMBER);
             if (TextUtils.isEmpty(lastNumber)) {
-                System.err.println("Empty number");
                 return;
             }
 
@@ -49,7 +50,7 @@ public class PhoneStateChangedReceiver extends BroadcastReceiver {
             new Thread() {
                 @Override
                 public void run() {
-                    AndroidUtilities.sleepDeep(3000L);
+                    AndroidUtilities.sleepDeep(WAIT_BEFORE_READ_LOG);
                     Cursor calls = context.getContentResolver().query(
                             Calls.CONTENT_URI,
                             null,
@@ -59,13 +60,12 @@ public class PhoneStateChangedReceiver extends BroadcastReceiver {
                             );
                     try {
                         if (calls.moveToFirst()) {
-                            System.err.println("Processing");
                             int numberIndex = calls.getColumnIndex(Calls.NUMBER);
                             String number = calls.getString(numberIndex);
 
-                            // Check for phone number match
+                            // Sanity check for phone number match
+                            // in case the phone logs haven't updated for some reaosn
                             if (!lastNumber.equals(digitsOnly(number))) {
-                                System.err.println("Number mismatch");
                                 return;
                             }
 
@@ -76,9 +76,6 @@ public class PhoneStateChangedReceiver extends BroadcastReceiver {
                             int dateIndex = calls.getColumnIndex(Calls.DATE);
                             long date = calls.getLong(dateIndex);
                             if (DateUtilities.now() - date > 2 * DateUtilities.ONE_MINUTE) {
-                                System.err.println("Date: " + date);
-                                System.err.println("Diff: " + (DateUtilities.now() - date));
-                                System.err.println("Time mismatch");
                                 return;
                             }
 
@@ -104,8 +101,6 @@ public class PhoneStateChangedReceiver extends BroadcastReceiver {
                     }
                 }
             }.start();
-        } else {
-            System.err.println("ASTRID Other state: " + state);
         }
     }