diff --git a/rtl/python.py b/py/example.py
similarity index 100%
rename from rtl/python.py
rename to py/example.py
diff --git a/rtl/skid_buffer.sv b/rtl/skid_buffer.sv
index 8d80058..924b1f0 100644
--- a/rtl/skid_buffer.sv
+++ b/rtl/skid_buffer.sv
@@ -1,12 +1,9 @@
-module skid_buffer #(
-  parameter WIDTH = 8
-)(
+module skid_buffer #( parameter WIDTH = 8)(
   input  logic clk, rstn, s_valid, m_ready,
   input  logic [WIDTH-1:0] s_data,
   output logic [WIDTH-1:0] m_data,
   output logic m_valid, s_ready
 );
-  // State machine (3 procedure)
   enum {FULL, EMPTY} state, state_next;
   always_comb begin
     state_next = state;
@@ -19,35 +16,25 @@ module skid_buffer #(
     if      (!rstn)              state <= EMPTY;
     else if (m_ready || s_ready) state <= state_next;
 
-  // s_ready is registered, breaking the combinational path
-  always_ff @(posedge clk)
-    s_ready <= !rstn ? 1 : (state_next == EMPTY);
-
-  // Buffer valid & data, when m_ready goes low
-  wire buffer_en = (state_next == FULL) && (state==EMPTY);
-
-  logic [WIDTH-1:0] b_data;
   logic b_valid;
+  logic [WIDTH-1:0] b_data;
+  wire  [WIDTH-1:0] m_data_next  = (state      == FULL) ? b_data  : s_data;
+  wire              m_valid_next = (state      == FULL) ? b_valid : s_valid;
+  wire              buffer_en    = (state_next == FULL) && (state==EMPTY);
+  wire              m_en         = m_valid_next & m_ready;
 
   always_ff @(posedge clk)
-    if      (!rstn)     b_valid <= 0;
-    else if (buffer_en) b_valid <= s_valid;
-
-  always_ff @(posedge clk)
+    if (!rstn) begin
+      s_ready <= 1;
+      {m_valid, b_valid} <= '0;
+    end else begin
+      s_ready <= state_next == EMPTY;
+      if (buffer_en) b_valid <= s_valid;      
+      if (m_ready  ) m_valid <= m_valid_next;
+    end
+    
+  always_ff @(posedge clk) begin
+    if (m_en)                 m_data <= m_data_next;
     if (buffer_en && s_valid) b_data <= s_data;
-  
-
-  // m_data and m_valid are registered from mux
-
-  wire [WIDTH-1:0] m_data_next  = (state == FULL) ? b_data  : s_data;
-  wire             m_valid_next = (state == FULL) ? b_valid : s_valid;
-  wire             m_en         = m_valid_next & m_ready;
-
-  always_ff @(posedge clk)
-    if      (!rstn)   m_valid <= 0;
-    else if (m_ready) m_valid <= m_valid_next;
-
-  always_ff @(posedge clk)
-    if (m_en) m_data <= m_data_next;
-
+  end
 endmodule
\ No newline at end of file