diff --git a/app/src/main/java/eu/worn/apps/androvac/AndroidIRBeamer.java b/app/src/main/java/eu/worn/apps/androvac/AndroidIRBeamer.java
index c77acb6..9f724a7 100644
--- a/app/src/main/java/eu/worn/apps/androvac/AndroidIRBeamer.java
+++ b/app/src/main/java/eu/worn/apps/androvac/AndroidIRBeamer.java
@@ -5,9 +5,9 @@ import android.content.Context;
 import android.hardware.ConsumerIrManager;
 
 public class AndroidIRBeamer implements IRBeamer {
-    private ConsumerIrManager cim;
+    private final ConsumerIrManager cim;
 
-    public AndroidIRBeamer(Activity act) {
+    AndroidIRBeamer(Activity act) {
         Context ctx = act.getApplicationContext();
         cim = (ConsumerIrManager) ctx.getSystemService(Context.CONSUMER_IR_SERVICE);
     }
diff --git a/app/src/main/java/eu/worn/apps/androvac/DebugIRBeamer.java b/app/src/main/java/eu/worn/apps/androvac/DebugIRBeamer.java
index b4fe1bf..833d79f 100644
--- a/app/src/main/java/eu/worn/apps/androvac/DebugIRBeamer.java
+++ b/app/src/main/java/eu/worn/apps/androvac/DebugIRBeamer.java
@@ -4,9 +4,9 @@ import android.app.Activity;
 import android.widget.Toast;
 
 public class DebugIRBeamer implements IRBeamer {
-    private Activity act;
+    private final Activity act;
 
-    public DebugIRBeamer(Activity act) {
+    DebugIRBeamer(Activity act) {
         this.act = act;
     }
     public boolean isAvailable() { return true; }
diff --git a/app/src/main/java/eu/worn/apps/androvac/IRBeamer.java b/app/src/main/java/eu/worn/apps/androvac/IRBeamer.java
index 417f72e..d114793 100644
--- a/app/src/main/java/eu/worn/apps/androvac/IRBeamer.java
+++ b/app/src/main/java/eu/worn/apps/androvac/IRBeamer.java
@@ -1,6 +1,6 @@
 package eu.worn.apps.androvac;
 
-public interface IRBeamer {
+interface IRBeamer {
     boolean isAvailable();
     void transmit(int carrier, int[] pulses);
 }
diff --git a/app/src/main/java/eu/worn/apps/androvac/IRModulation.java b/app/src/main/java/eu/worn/apps/androvac/IRModulation.java
index 8ac969a..010ac2b 100644
--- a/app/src/main/java/eu/worn/apps/androvac/IRModulation.java
+++ b/app/src/main/java/eu/worn/apps/androvac/IRModulation.java
@@ -1,6 +1,6 @@
 package eu.worn.apps.androvac;
 
-public interface IRModulation {
+interface IRModulation {
     int getCarrierFrequency();
     int[] modulate(byte[] frame);
 }
diff --git a/app/src/main/java/eu/worn/apps/androvac/RoboVac11sRemote.java b/app/src/main/java/eu/worn/apps/androvac/RoboVac11sRemote.java
index 2313551..02320b7 100644
--- a/app/src/main/java/eu/worn/apps/androvac/RoboVac11sRemote.java
+++ b/app/src/main/java/eu/worn/apps/androvac/RoboVac11sRemote.java
@@ -2,8 +2,8 @@ package eu.worn.apps.androvac;
 
 import java.util.Calendar;
 
-public class RoboVac11sRemote {
-    public IRModulation modulation = new EufyIRModulation();
+class RoboVac11sRemote {
+    final IRModulation modulation = new EufyIRModulation();
 
     private Calendar schedule;
 
@@ -25,7 +25,7 @@ public class RoboVac11sRemote {
         return msg;
     }
 
-    public RoboVac11sRemote() {
+    RoboVac11sRemote() {
         schedule = null;
     }
 
@@ -37,21 +37,21 @@ public class RoboVac11sRemote {
         return schedule;
     }
 
-    public byte[] cleanAuto()       { return buildMessage((byte) 0x5d); }
-    public byte[] cleanSpot()       { return buildMessage((byte) 0x8c); }
-    public byte[] cleanEdge()       { return buildMessage((byte) 0x9c); }
-    public byte[] cleanRoom()       { return buildMessage((byte) 0xad); }
+    byte[] cleanAuto()       { return buildMessage((byte) 0x5d); }
+    byte[] cleanSpot()       { return buildMessage((byte) 0x8c); }
+    byte[] cleanEdge()       { return buildMessage((byte) 0x9c); }
+    byte[] cleanRoom()       { return buildMessage((byte) 0xad); }
 
-    public byte[] powerStandard()   { return buildMessage((byte) 0x1e); }
-    public byte[] powerMax()        { return buildMessage((byte) 0x1c); }
-    public byte[] powerBoostIQ()    { return buildMessage((byte) 0x1d); }
+    byte[] powerStandard()   { return buildMessage((byte) 0x1e); }
+    byte[] powerMax()        { return buildMessage((byte) 0x1c); }
+    byte[] powerBoostIQ()    { return buildMessage((byte) 0x1d); }
 
-    public byte[] moveForward()     { return buildMessage((byte) 0x2f); }
-    public byte[] moveBackward()    { return buildMessage((byte) 0x7f); }
-    public byte[] moveCCW()         { return buildMessage((byte) 0x3f); }
-    public byte[] moveCW()          { return buildMessage((byte) 0x6f); }
-    public byte[] returnBase()      { return buildMessage((byte) 0xef); }
+    byte[] moveForward()     { return buildMessage((byte) 0x2f); }
+    byte[] moveBackward()    { return buildMessage((byte) 0x7f); }
+    byte[] moveCCW()         { return buildMessage((byte) 0x3f); }
+    byte[] moveCW()          { return buildMessage((byte) 0x6f); }
+    byte[] returnBase()      { return buildMessage((byte) 0xef); }
 
-    public byte[] stop()            { return buildMessage((byte) 0x4f); }
+    byte[] stop()            { return buildMessage((byte) 0x4f); }
 
 }