diff --git a/src/modules/fw_att_control/FixedwingAttitudeControl.hpp b/src/modules/fw_att_control/FixedwingAttitudeControl.hpp
index 117155ba69..7f13ea37b8 100644
--- a/src/modules/fw_att_control/FixedwingAttitudeControl.hpp
+++ b/src/modules/fw_att_control/FixedwingAttitudeControl.hpp
@@ -131,15 +131,15 @@ private:
 	uORB::Publication<vehicle_thrust_setpoint_s>	_vehicle_thrust_setpoint_pub{ORB_ID(vehicle_thrust_setpoint)};
 	uORB::Publication<vehicle_torque_setpoint_s>	_vehicle_torque_setpoint_pub{ORB_ID(vehicle_torque_setpoint)};
 
-	actuator_controls_s			_actuator_controls {};		/**< actuator control inputs */
-	manual_control_setpoint_s		_manual_control_setpoint {};	/**< r/c channel data */
-	vehicle_attitude_setpoint_s		_att_sp {};			/**< vehicle attitude setpoint */
-	vehicle_control_mode_s			_vcontrol_mode {};		/**< vehicle control mode */
-	vehicle_local_position_s		_local_pos {};			/**< local position */
-	vehicle_rates_setpoint_s		_rates_sp {};			/* attitude rates setpoint */
-	vehicle_status_s			_vehicle_status {};		/**< vehicle status */
-
-	perf_counter_t	_loop_perf;						/**< loop performance counter */
+	actuator_controls_s			_actuator_controls{};
+	manual_control_setpoint_s		_manual_control_setpoint{};
+	vehicle_attitude_setpoint_s		_att_sp{};
+	vehicle_control_mode_s			_vcontrol_mode{};
+	vehicle_local_position_s		_local_pos{};
+	vehicle_rates_setpoint_s		_rates_sp{};
+	vehicle_status_s			_vehicle_status{};
+
+	perf_counter_t _loop_perf;
 
 	hrt_abstime _last_run{0};
 
diff --git a/src/modules/fw_pos_control_l1/FixedwingPositionControl.hpp b/src/modules/fw_pos_control_l1/FixedwingPositionControl.hpp
index df2b58786a..a657ec2d20 100644
--- a/src/modules/fw_pos_control_l1/FixedwingPositionControl.hpp
+++ b/src/modules/fw_pos_control_l1/FixedwingPositionControl.hpp
@@ -185,12 +185,12 @@ private:
 	uORB::Publication<tecs_status_s> _tecs_status_pub{ORB_ID(tecs_status)};
 	uORB::PublicationMulti<orbit_status_s> _orbit_status_pub{ORB_ID(orbit_status)};
 
-	manual_control_setpoint_s _manual_control_setpoint {}; // r/c channel data
-	position_setpoint_triplet_s _pos_sp_triplet {}; // triplet of mission items
-	vehicle_attitude_setpoint_s _att_sp {}; // vehicle attitude setpoint
-	vehicle_control_mode_s _control_mode {};
-	vehicle_local_position_s _local_pos {};	// vehicle local position
-	vehicle_status_s _vehicle_status {}; // vehicle status
+	manual_control_setpoint_s _manual_control_setpoint{};
+	position_setpoint_triplet_s _pos_sp_triplet{};
+	vehicle_attitude_setpoint_s _att_sp{};
+	vehicle_control_mode_s _control_mode{};
+	vehicle_local_position_s _local_pos{};
+	vehicle_status_s _vehicle_status{};
 
 	double _current_latitude{0};
 	double _current_longitude{0};
@@ -212,8 +212,8 @@ private:
 
 	float _min_current_sp_distance_xy{FLT_MAX};
 
-	position_setpoint_s _hdg_hold_prev_wp {}; // position where heading hold started
-	position_setpoint_s _hdg_hold_curr_wp {}; // position to which heading hold flies
+	position_setpoint_s _hdg_hold_prev_wp{}; // position where heading hold started
+	position_setpoint_s _hdg_hold_curr_wp{}; // position to which heading hold flies
 
 	// [us] Last absolute time position control has been called
 	hrt_abstime _last_time_position_control_called{0};
diff --git a/src/modules/uuv_att_control/uuv_att_control.hpp b/src/modules/uuv_att_control/uuv_att_control.hpp
index f41fdaa103..4a6cd0dba0 100644
--- a/src/modules/uuv_att_control/uuv_att_control.hpp
+++ b/src/modules/uuv_att_control/uuv_att_control.hpp
@@ -117,13 +117,13 @@ private:
 
 	uORB::SubscriptionCallbackWorkItem _vehicle_attitude_sub{this, ORB_ID(vehicle_attitude)};
 
-	actuator_controls_s _actuators {}; /**< actuator control inputs */
-	manual_control_setpoint_s _manual_control_setpoint {}; /**< r/c channel data */
-	vehicle_attitude_setpoint_s _attitude_setpoint {}; /**< vehicle attitude setpoint */
-	vehicle_rates_setpoint_s _rates_setpoint {}; /**< vehicle bodyrates setpoint */
-	vehicle_control_mode_s _vcontrol_mode {}; /**< vehicle control mode */
+	actuator_controls_s _actuators{};
+	manual_control_setpoint_s _manual_control_setpoint{};
+	vehicle_attitude_setpoint_s _attitude_setpoint{};
+	vehicle_rates_setpoint_s _rates_setpoint{};
+	vehicle_control_mode_s _vcontrol_mode{};
 
-	perf_counter_t	_loop_perf; /**< loop performance counter */
+	perf_counter_t	_loop_perf;
 
 	DEFINE_PARAMETERS(
 		(ParamFloat<px4::params::UUV_ROLL_P>) _param_roll_p,
diff --git a/src/modules/uuv_pos_control/uuv_pos_control.hpp b/src/modules/uuv_pos_control/uuv_pos_control.hpp
index ee03c9a870..c9a2f253c2 100644
--- a/src/modules/uuv_pos_control/uuv_pos_control.hpp
+++ b/src/modules/uuv_pos_control/uuv_pos_control.hpp
@@ -102,18 +102,17 @@ private:
 
 	uORB::SubscriptionInterval _parameter_update_sub{ORB_ID(parameter_update), 1_s};
 
-	uORB::Subscription _vehicle_attitude_sub{ORB_ID(vehicle_attitude)};	/**< current vehicle attitude */
+	uORB::Subscription _vehicle_attitude_sub{ORB_ID(vehicle_attitude)};
 	uORB::Subscription _trajectory_setpoint_sub{ORB_ID(trajectory_setpoint)};
-	uORB::Subscription _vcontrol_mode_sub{ORB_ID(vehicle_control_mode)};		/**< vehicle status subscription */
+	uORB::Subscription _vcontrol_mode_sub{ORB_ID(vehicle_control_mode)};
 
 	uORB::SubscriptionCallbackWorkItem _vehicle_local_position_sub{this, ORB_ID(vehicle_local_position)};
 
-	//actuator_controls_s _actuators {}; /**< actuator control inputs */
-	vehicle_attitude_s _vehicle_attitude {}; /**< vehicle attitude */
-	trajectory_setpoint_s _trajectory_setpoint{}; /**< vehicle position setpoint */
-	vehicle_control_mode_s _vcontrol_mode {}; /**< vehicle control mode */
+	vehicle_attitude_s _vehicle_attitude{};
+	trajectory_setpoint_s _trajectory_setpoint{};
+	vehicle_control_mode_s _vcontrol_mode{};
 
-	perf_counter_t	_loop_perf; /**< loop performance counter */
+	perf_counter_t	_loop_perf;
 
 	DEFINE_PARAMETERS(
 		(ParamFloat<px4::params::UUV_GAIN_X_P>) _param_pose_gain_x,