diff --git a/Intel8080/src/Intel8080.cpp b/Intel8080/src/Intel8080.cpp
index e9c6c9e..1f92a0b 100644
--- a/Intel8080/src/Intel8080.cpp
+++ b/Intel8080/src/Intel8080.cpp
@@ -297,7 +297,7 @@ int EightBit::Intel8080::execute(uint8_t opcode) {
 
 	execute(x, y, z, p, q);
 
-	if (cycles() == 0)
+	if (UNLIKELY(cycles() == 0))
 		throw std::logic_error("Unhandled opcode");
 
 	return cycles();
@@ -416,13 +416,13 @@ void EightBit::Intel8080::execute(int x, int y, int z, int p, int q) {
 			decrement(f, operand);
 			R(y, a, operand);
 			addCycles(4);
-			if (y == 6)
+			if (UNLIKELY(y == 6))
 				addCycles(7);
 			break;
 		} case 6:	// 8-bit load immediate
 			R(y, a, fetchByte());
 			addCycles(7);
-			if (y == 6)
+			if (UNLIKELY(y == 6))
 				addCycles(3);
 			break;
 		case 7:	// Assorted operations on accumulator/flags
@@ -461,11 +461,11 @@ void EightBit::Intel8080::execute(int x, int y, int z, int p, int q) {
 		}
 		break;
 	case 1:	// 8-bit loading
-		if (z == 6 && y == 6) { 	// Exception (replaces LD (HL), (HL))
+		if (UNLIKELY(z == 6 && y == 6)) { 	// Exception (replaces LD (HL), (HL))
 			halt();
 		} else {
 			R(y, a, R(z, a));
-			if ((y == 6) || (z == 6))	// M operations
+			if (UNLIKELY((y == 6) || (z == 6)))	// M operations
 				addCycles(3);
 		}
 		addCycles(4);
@@ -500,7 +500,7 @@ void EightBit::Intel8080::execute(int x, int y, int z, int p, int q) {
 			UNREACHABLE;
 		}
 		addCycles(4);
-		if (z == 6)
+		if (UNLIKELY(z == 6))
 			addCycles(3);
 		break;
 	case 3:
diff --git a/Z80/inc/Z80.h b/Z80/inc/Z80.h
index 7188bad..e89a30a 100644
--- a/Z80/inc/Z80.h
+++ b/Z80/inc/Z80.h
@@ -175,7 +175,7 @@ namespace EightBit {
 				HL2().low = value;
 				break;
 			case 6:
-				setByte(LIKELY(!m_displaced) ?  HL().word : displacedAddress(), value);
+				setByte(LIKELY(!m_displaced) ? HL().word : displacedAddress(), value);
 				break;
 			case 7:
 				a = value;