diff --git a/gcode_parse.h b/gcode_parse.h
index 3db8a84..84c4820 100644
--- a/gcode_parse.h
+++ b/gcode_parse.h
@@ -45,18 +45,18 @@ typedef struct {
 		uint8_t					option_inches				:1; ///< inches or millimeters?
 	};
 
+  uint32_t          N;          ///< line number
+  uint32_t          N_expected; ///< expected line number
+
+  int32_t           S;          ///< S word (various uses)
+  uint16_t          P;          ///< P word (various uses)
+
 	uint8_t						G;				///< G command number
 	uint8_t						M;				///< M command number
 	TARGET						target;		///< target position: X, Y, Z, E and F
 
-	int32_t						S;				///< S word (various uses)
-	uint16_t					P;				///< P word (various uses)
-
 	uint8_t						T;				///< T word (tool index)
 
-	uint32_t					N;				///< line number
-	uint32_t					N_expected;	///< expected line number
-
 	uint8_t						checksum_read;				///< checksum in gcode command
 	uint8_t						checksum_calculated;	///< checksum we calculated
 } GCODE_COMMAND;