diff --git a/msg/GotoSetpoint.msg b/msg/GotoSetpoint.msg
index e67082a072..6fdd32a5e5 100644
--- a/msg/GotoSetpoint.msg
+++ b/msg/GotoSetpoint.msg
@@ -9,17 +9,17 @@ uint64 timestamp # time since system start (microseconds)
 
 # setpoints
 float32[3] position # [m] NED local world frame
+
+bool flag_control_heading # true if heading is to be controlled
 float32 heading # (optional) [rad] [-pi,pi] from North
 
-# setpoint flags
-bool flag_control_heading # true if heading is to be controlled
-
 # constraints
+bool flag_set_max_horizontal_speed # true if setting a non-default horizontal speed limit
 float32 max_horizontal_speed # (optional) [m/s] maximum speed (absolute) in the NE-plane
+
+bool flag_set_max_vertical_speed # true if setting a non-default vertical speed limit
 float32 max_vertical_speed # (optional) [m/s] maximum speed (absolute) in the D-axis
+
+bool flag_set_max_heading_rate # true if setting a non-default heading rate limit
 float32 max_heading_rate # (optional) [rad/s] maximum heading rate (absolute)
 
-# constraint flags
-bool flag_set_max_horizontal_speed # true if setting a non-default horizontal speed limit
-bool flag_set_max_vertical_speed # true if setting a non-default vertical speed limit
-bool flag_set_max_heading_rate # true if setting a non-default heading rate limit