diff --git a/deobfuscator/src/main/java/net/runelite/asm/Annotation.java b/deobfuscator/src/main/java/net/runelite/asm/Annotation.java
index 1797502fbf..efcb4203c1 100644
--- a/deobfuscator/src/main/java/net/runelite/asm/Annotation.java
+++ b/deobfuscator/src/main/java/net/runelite/asm/Annotation.java
@@ -99,7 +99,7 @@ public class Annotation extends AnnotationVisitor implements Comparable<Annotati
 
 	public Object getValue()
 	{
-		return data.get("value");
+		return get("value");
 	}
 
 	public String getValueString()
diff --git a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/cfg/Block.java b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/cfg/Block.java
index eb36e6037d..c40355c29d 100644
--- a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/cfg/Block.java
+++ b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/cfg/Block.java
@@ -26,9 +26,13 @@ package net.runelite.deob.deobfuscators.cfg;
 
 import java.util.ArrayList;
 import java.util.List;
+import lombok.Getter;
+import lombok.Setter;
 import net.runelite.asm.attributes.code.Instruction;
 import net.runelite.asm.attributes.code.Label;
 
+@Getter
+@Setter
 public class Block
 {
 	private int id = -1;
@@ -37,64 +41,44 @@ public class Block
 	/**
 	 * blocks which jump here
 	 */
-	private final List<Block> pred = new ArrayList<>();
+	private final List<Block> preds = new ArrayList<>();
 
 	/**
 	 * blocks which this jumps to
 	 */
-	private final List<Block> succ = new ArrayList<>();
+	private final List<Block> succs = new ArrayList<>();
 
 	/**
 	 * block which flows directly into this block
 	 */
-	private Block from;
+	private Block pred;
 
 	/**
 	 * block which this directly flows into
 	 */
-	private Block into;
+	private Block succ;
 
 	/**
 	 * instructions in this block
 	 */
 	private final List<Instruction> instructions = new ArrayList<>();
 
-	public int getId()
-	{
-		return id;
-	}
-
-	public void setId(int id)
-	{
-		this.id = id;
-	}
-
-	public boolean isJumptarget()
-	{
-		return jumptarget;
-	}
-
-	public void setJumptarget(boolean jumptarget)
-	{
-		this.jumptarget = jumptarget;
-	}
-
 	@Override
 	public String toString()
 	{
 		StringBuilder sb = new StringBuilder();
 		sb.append("Block ID ").append(id).append("\n");
-		if (from != null)
+		if (pred != null)
 		{
-			sb.append(" flows from ").append(from.id).append("\n");
+			sb.append(" flows from ").append(pred.id).append("\n");
 		}
 		for (Instruction i : instructions)
 		{
 			sb.append("  ").append(i.toString()).append("\n");
 		}
-		if (into != null)
+		if (succ != null)
 		{
-			sb.append(" flows into ").append(into.id).append("\n");
+			sb.append(" flows into ").append(succ.id).append("\n");
 		}
 		sb.append("\n");
 		return sb.toString();
@@ -112,57 +96,22 @@ public class Block
 		instructions.add(i);
 	}
 
-	public List<Instruction> getInstructions()
-	{
-		return instructions;
-	}
-
 	public void addPrev(Block block)
 	{
-		if (!pred.contains(block))
+		if (!preds.contains(block))
 		{
-			pred.add(block);
+			preds.add(block);
 		}
 	}
 
-	public List<Block> getPred()
-	{
-		return pred;
-	}
-
 	public void addNext(Block block)
 	{
-		if (!succ.contains(block))
+		if (!succs.contains(block))
 		{
-			succ.add(block);
+			succs.add(block);
 		}
 	}
 
-	public List<Block> getSucc()
-	{
-		return succ;
-	}
-
-	public Block getFrom()
-	{
-		return from;
-	}
-
-	public void setFrom(Block from)
-	{
-		this.from = from;
-	}
-
-	public Block getInto()
-	{
-		return into;
-	}
-
-	public void setInto(Block into)
-	{
-		this.into = into;
-	}
-
 	static int compare(Block a, Block b)
 	{
 		final int l1 = a.getLineNumber();
diff --git a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/cfg/ControlFlowDeobfuscator.java b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/cfg/ControlFlowDeobfuscator.java
index e544c6bbf1..285d81d277 100644
--- a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/cfg/ControlFlowDeobfuscator.java
+++ b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/cfg/ControlFlowDeobfuscator.java
@@ -90,12 +90,12 @@ public class ControlFlowDeobfuscator implements Deobfuscator
 				ins.addInstruction(i);
 				i.setInstructions(ins);
 			}
-			if (b.getInto() != null && b.getInstructions().size() > 0)
+			if (b.getSucc() != null && b.getInstructions().size() > 0)
 			{
 				final var i = b.getInstructions().get(b.getInstructions().size() - 1);
 				if (!i.isTerminal())
 				{
-					final var next = b.getInto();
+					final var next = b.getSucc();
 					var maybeLabel = next.getInstructions().get(0);
 					if (!(maybeLabel instanceof Label))
 					{
diff --git a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/cfg/ControlFlowGraph.java b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/cfg/ControlFlowGraph.java
index c6597f2083..a7456a29b1 100644
--- a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/cfg/ControlFlowGraph.java
+++ b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/cfg/ControlFlowGraph.java
@@ -73,11 +73,11 @@ public class ControlFlowGraph
 						: cur.getInstructions().get(cur.getInstructions().size() - 1);
 					if (last == null || !last.isTerminal())
 					{
-						assert next.getFrom() == null;
-						assert cur.getInto() == null;
+						assert next.getPred() == null;
+						assert cur.getSucc() == null;
 						// previous block flows directly into next
-						next.setFrom(cur);
-						cur.setInto(next);
+						next.setPred(cur);
+						cur.setSucc(next);
 					}
 					cur = next;
 				}
@@ -99,7 +99,7 @@ public class ControlFlowGraph
 			}
 		}
 
-		assert head.getFrom() == null;
+		assert head.getPred() == null;
 	}
 
 	List<Block> topologicalSort()
@@ -112,10 +112,10 @@ public class ControlFlowGraph
 
 	private static void walk(Block cur, List<Block> order, Set<Block> done)
 	{
-		Block dirsucc = cur.getInto();
+		Block dirsucc = cur.getSucc();
 		if (dirsucc != null && done.add(dirsucc))
-			walk(cur.getInto(), order, done);
-		List<Block> succs = cur.getSucc();
+			walk(cur.getSucc(), order, done);
+		List<Block> succs = cur.getSuccs();
 		succs.sort(Block::compare);
 		for (Block succ : succs)
 			if (done.add(succ))