diff --git a/VirtualJTCCommon/src/main/java/org/sqar/virtualjtc/z8/Z8.java b/VirtualJTCCommon/src/main/java/org/sqar/virtualjtc/z8/Z8.java
index 21c0688..3f98f8b 100755
--- a/VirtualJTCCommon/src/main/java/org/sqar/virtualjtc/z8/Z8.java
+++ b/VirtualJTCCommon/src/main/java/org/sqar/virtualjtc/z8/Z8.java
@@ -219,7 +219,7 @@ public Z8(int cyclesPerSecond, boolean regInitZero, Z8Memory memory, Z8IO z8io)
 
 
     public synchronized void addPCListener(int addr, Z8PCListener listener) {
-        PCListenerItem[] items = null;
+        PCListenerItem[] items;
         if (this.pcListenerItems != null) {
             items = new PCListenerItem[this.pcListenerItems.length + 1];
             System.arraycopy(this.pcListenerItems, 0, items, 0, this.pcListenerItems.length);
@@ -233,7 +233,7 @@ public synchronized void addPCListener(int addr, Z8PCListener listener) {
 
     public synchronized void removePCListener(int addr, Z8PCListener listener) {
         if (this.pcListenerItems != null) {
-            java.util.List<PCListenerItem> list = new ArrayList<PCListenerItem>(
+            java.util.List<PCListenerItem> list = new ArrayList<>(
                     this.pcListenerItems.length);
             boolean changed = false;
             for (PCListenerItem item : this.pcListenerItems) {
@@ -376,7 +376,7 @@ public int getRegValue(int r) {
 
 
     public RunMode getRunMode() {
-        RunMode runMode = null;
+        RunMode runMode;
         synchronized (this.waitMonitor) {
             runMode = this.runMode;
         }