diff --git a/app/src/main/kotlin/android/emu6502/CPU.kt b/app/src/main/kotlin/android/emu6502/CPU.kt
index 32a7d2a..0fa578c 100644
--- a/app/src/main/kotlin/android/emu6502/CPU.kt
+++ b/app/src/main/kotlin/android/emu6502/CPU.kt
@@ -70,7 +70,6 @@ class CPU(val memory: Memory) : Display.Callbacks {
     while (true) {
       setRandomByte()
       executeNextInstruction()
-
       if (PC == 0 || !isRunning) {
         break
       }
@@ -111,7 +110,6 @@ class CPU(val memory: Memory) : Display.Callbacks {
     } else {
       val candidate = Opcodes.MAP.entries
           .first { it.value.any { opcode -> opcode == instruction } }
-
       throw Exception(
           "Address $${PC.toHexString()} - unknown opcode 0x${instruction.toHexString()} " +
               "(instruction ${candidate.key.name})")
diff --git a/app/src/test/java/android/emu6502/AssemblerTest.java b/app/src/test/java/android/emu6502/AssemblerTest.java
index 61a6039..96bfb59 100644
--- a/app/src/test/java/android/emu6502/AssemblerTest.java
+++ b/app/src/test/java/android/emu6502/AssemblerTest.java
@@ -1,10 +1,9 @@
 package android.emu6502;
 
-import android.emu6502.instructions.Symbols;
-
 import com.google.common.collect.ImmutableList;
 
-import org.junit.Before;
+import android.emu6502.instructions.Symbols;
+
 import org.junit.Test;
 
 import java.util.List;
@@ -15,12 +14,7 @@ import static org.junit.Assert.assertThat;
 import static org.mockito.Mockito.mock;
 
 public class AssemblerTest {
-
-  private Assembler assembler;
-
-  @Before public void setUp() {
-    assembler = new Assembler(new Memory(mock(Display.class)), new Symbols());
-  }
+  private final Assembler assembler = new Assembler(new Memory(mock(Display.class)), new Symbols());
 
   @Test public void testSimple() {
     List<String> lines = ImmutableList.of(
diff --git a/app/src/test/java/android/emu6502/CPUTest.java b/app/src/test/java/android/emu6502/CPUTest.java
index 4926fd8..007efb5 100644
--- a/app/src/test/java/android/emu6502/CPUTest.java
+++ b/app/src/test/java/android/emu6502/CPUTest.java
@@ -1,10 +1,9 @@
 package android.emu6502;
 
-import android.emu6502.instructions.Symbols;
-
 import com.google.common.collect.ImmutableList;
 
-import org.junit.Before;
+import android.emu6502.instructions.Symbols;
+
 import org.junit.Test;
 
 import java.util.List;
@@ -14,16 +13,9 @@ import static org.junit.Assert.assertThat;
 import static org.mockito.Mockito.mock;
 
 public class CPUTest {
-
-  private CPU cpu;
-  private Assembler assembler;
-
-  @Before public void setUp() {
-
-    Memory memory = new Memory(mock(Display.class));
-    assembler = new Assembler(memory, new Symbols());
-    cpu = new CPU(memory);
-  }
+  private final Memory memory = new Memory(mock(Display.class));
+  private final Assembler assembler = new Assembler(memory, new Symbols());
+  private final CPU cpu = new CPU(memory);
 
   @Test public void testSimple() {
     List<String> lines = ImmutableList.of(
diff --git a/app/src/test/java/android/emu6502/LabelsTest.java b/app/src/test/java/android/emu6502/LabelsTest.java
index bc2bc58..bff01a6 100644
--- a/app/src/test/java/android/emu6502/LabelsTest.java
+++ b/app/src/test/java/android/emu6502/LabelsTest.java
@@ -2,7 +2,6 @@ package android.emu6502;
 
 import android.emu6502.instructions.Symbols;
 
-import org.junit.Before;
 import org.junit.Test;
 
 import java.util.Collections;
@@ -12,15 +11,9 @@ import static org.junit.Assert.assertThat;
 import static org.mockito.Mockito.mock;
 
 public class LabelsTest {
-
-  private Labels labels;
-  private Assembler assembler;
-
-  @Before public void setUp() {
-    Symbols symbols = new Symbols();
-    assembler = new Assembler(new Memory(mock(Display.class)), symbols);
-    labels = new Labels(assembler, symbols);
-  }
+  private final Symbols symbols = new Symbols();
+  private final Assembler assembler = new Assembler(new Memory(mock(Display.class)), symbols);
+  private final Labels labels = new Labels(assembler, symbols);
 
   @Test public void testAddLabel() {
     labels.indexLines(Collections.singletonList("test:"));