diff --git a/hdl/arith/hazard3_alu.v b/hdl/arith/hazard3_alu.v
index ebf523c..cf4412d 100644
--- a/hdl/arith/hazard3_alu.v
+++ b/hdl/arith/hazard3_alu.v
@@ -48,8 +48,8 @@ assign result_add = sum;
 
 
 wire [W_DATA-1:0] shift_dout;
-reg shift_right_nleft;
-reg shift_arith;
+wire shift_right_nleft = aluop == ALUOP_SRL || aluop == ALUOP_SRA;
+wire shift_arith = aluop == ALUOP_SRA;
 
 hazard3_shift_barrel #(
 	.W_DATA(W_DATA),
@@ -76,15 +76,13 @@ always @ (*) begin: bitwise_ops
 end
 
 always @ (*) begin
-	shift_right_nleft = 1'b0;
-	shift_arith = 1'b0;
 	case (aluop)
 		ALUOP_ADD: begin result = sum; end
 		ALUOP_SUB: begin result = sum; end
 		ALUOP_LT:  begin result = {{W_DATA-1{1'b0}}, lt}; end
 		ALUOP_LTU: begin result = {{W_DATA-1{1'b0}}, lt}; end
-		ALUOP_SRL: begin shift_right_nleft = 1'b1; result = shift_dout; end
-		ALUOP_SRA: begin shift_right_nleft = 1'b1; shift_arith = 1'b1; result = shift_dout; end
+		ALUOP_SRL: begin result = shift_dout; end
+		ALUOP_SRA: begin result = shift_dout; end
 		ALUOP_SLL: begin result = shift_dout; end
 		default:   begin result = bitwise; end
 	endcase
diff --git a/hdl/arith/hazard3_shift_barrel.v b/hdl/arith/hazard3_shift_barrel.v
index ef8bd7c..9ce6472 100644
--- a/hdl/arith/hazard3_shift_barrel.v
+++ b/hdl/arith/hazard3_shift_barrel.v
@@ -39,9 +39,7 @@ wire sext = arith && din_rev[0]; // haha
 always @ (*) begin
 	for (i = 0; i < W_DATA; i = i + 1)
 		din_rev[i] = right_nleft ? din[W_DATA - 1 - i] : din[i];
-end
 
-always @ (*) begin
 	shift_accum = din_rev;
 	for (i = 0; i < W_SHAMT; i = i + 1) begin
 		if (shamt[i]) begin
@@ -49,9 +47,7 @@ always @ (*) begin
 				({W_DATA{sext}} & ~({W_DATA{1'b1}} << (1 << i)));
 		end
 	end
-end
 
-always @ (*) begin
 	for (i = 0; i < W_DATA; i = i + 1)
 		dout[i] = right_nleft ? shift_accum[W_DATA - 1 - i] : shift_accum[i];
 end