diff --git a/src/simulator/decode.rs b/src/simulator/decode.rs
index 32dc030..dea62b6 100644
--- a/src/simulator/decode.rs
+++ b/src/simulator/decode.rs
@@ -64,32 +64,32 @@ pub fn decode(val : u64) -> Instruction {
     let shamt           = ((val >> 20) & 0x3f) as u8;
     
     Instruction {
-        value : value,
+        value,
 
-        opcode : opcode,
-        rs1 : rs1,
-        rs2 : rs2,
-        rs3 : rs3,
-        rd  : rd,
-        funct7 : funct7,
-        funct7_smaller : funct7_smaller,
+        opcode,
+        rs1,
+        rs2,
+        rs3,
+        rd,
+        funct7,
+        funct7_smaller,
     
-        funct3 : funct3,
-        imm12_I : imm12_I,
-        imm12_S : imm12_S,
+        funct3,
+        imm12_I,
+        imm12_S,
     
-        imm12_I_signed : imm12_I_signed,
-        imm12_S_signed : imm12_S_signed,
+        imm12_I_signed,
+        imm12_S_signed,
     
-        imm13 : imm13,
-        imm13_signed : imm13_signed,
+        imm13,
+        imm13_signed,
     
-        imm31_12 : imm31_12,
-        imm31_12_signed : imm31_12_signed,
+        imm31_12,
+        imm31_12_signed,
     
-        imm21_1 : imm21_1,
-        imm21_1_signed : imm21_1_signed,
+        imm21_1,
+        imm21_1_signed,
     
-        shamt : shamt
+        shamt
     }
 }
\ No newline at end of file