diff --git a/app/src/main/java/de/jotomo/ruffyscripter/RuffyScripter.java b/app/src/main/java/de/jotomo/ruffyscripter/RuffyScripter.java
index ef6166c0bb..413f4f8401 100644
--- a/app/src/main/java/de/jotomo/ruffyscripter/RuffyScripter.java
+++ b/app/src/main/java/de/jotomo/ruffyscripter/RuffyScripter.java
@@ -106,8 +106,6 @@ public class RuffyScripter {
 
     private volatile Command activeCmd = null;
 
-    // TODO fire up a monitoring thread to intervene when we're stuck? re-bind service
-    // in case ruffy app went away
     public CommandResult runCommand(final Command cmd) {
         try {
             if (isPumpBusy()) {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboPlugin.java
index 8920ef196c..dc01bbce95 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboPlugin.java
@@ -46,10 +46,10 @@ import info.nightscout.utils.DateUtil;
 public class ComboPlugin implements PluginBase, PumpInterface {
     private static Logger log = LoggerFactory.getLogger(ComboPlugin.class);
 
-    boolean fragmentEnabled = false;
-    boolean fragmentVisible = false;
+    private boolean fragmentEnabled = false;
+    private boolean fragmentVisible = false;
 
-    PumpDescription pumpDescription = new PumpDescription();
+    private PumpDescription pumpDescription = new PumpDescription();
 
     // TODO quick hack until pump state is more thoroughly supported
     int activeTbrPercentage = -1;