diff --git a/src/FDM/YASim/Model.cpp b/src/FDM/YASim/Model.cpp
index c3383d0b7..4ca6d95da 100644
--- a/src/FDM/YASim/Model.cpp
+++ b/src/FDM/YASim/Model.cpp
@@ -50,28 +50,13 @@ void printState(State* s)
 
 Model::Model()
 {
-    int i;
-    for(i=0; i<3; i++) _wind[i] = 0;
-
     _integrator.setBody(&_body);
     _integrator.setEnvironment(this);
-
     // Default value of 30 Hz
     _integrator.setInterval(1.0f/30.0f);
 
-    _agl = 0;
-    _crashed = false;
-    _turb = 0;
     _ground_cb = new Ground();
-    _hook = 0;
-    _launchbar = 0;
 
-    _wingSpan = 0;
-    _groundEffect = 0;
-    for(i=0; i<3; i++) _geRefPoint[i] = 0;
-
-    _global_ground[0] = 0; _global_ground[1] = 0; _global_ground[2] = 1;
-    _global_ground[3] = -100000;
     _modelN = fgGetNode("/fdm/yasim/forces", true);
     _fAeroXN = _modelN->getNode("f-x-drag", true);
     _fAeroYN = _modelN->getNode("f-y-side", true);
@@ -98,11 +83,10 @@ void Model::getThrust(float* out) const
 {
     float tmp[3];
     out[0] = out[1] = out[2] = 0;
-    int i;
-    for(i=0; i<_thrusters.size(); i++) {
-	Thruster* t = (Thruster*)_thrusters.get(i);
-	t->getThrust(tmp);
-	Math::add3(tmp, out, out);
+    for(int i=0; i<_thrusters.size(); i++) {
+        Thruster* t = (Thruster*)_thrusters.get(i);
+        t->getThrust(tmp);
+        Math::add3(tmp, out, out);
     }
 }
 
@@ -153,8 +137,6 @@ void Model::initIteration()
         Hitch* h = (Hitch*)_hitches.get(i);
         h->integrate(_integrator.getInterval());
     }
-
-    
 }
 
 // This function initializes some variables for the rotor calculation
diff --git a/src/FDM/YASim/Model.hpp b/src/FDM/YASim/Model.hpp
index 00755b44d..75e2de16e 100644
--- a/src/FDM/YASim/Model.hpp
+++ b/src/FDM/YASim/Model.hpp
@@ -87,33 +87,33 @@ private:
     Integrator _integrator;
     RigidBody _body;
 
-    Turbulence* _turb;
+    Turbulence* _turb {nullptr};
 
     Vector _thrusters;
     Vector _surfaces;
     Rotorgear _rotorgear;
     Vector _gears;
-    Hook* _hook;
-    Launchbar* _launchbar;
+    Hook* _hook {nullptr};
+    Launchbar* _launchbar {nullptr};
     Vector _hitches;
 
-    float _wingSpan;
-    float _groundEffect;
-    float _geRefPoint[3];
+    float _wingSpan {0};
+    float _groundEffect {0};
+    float _geRefPoint[3] {0,0,0};
 
     Ground* _ground_cb;
-    double _global_ground[4];
+    double _global_ground[4] {0,0,1, -1e5};
     Atmosphere _atmo;
-    float _wind[3];
+    float _wind[3] {0,0,0};
     
 
     // Accumulators for the total internal gyro and engine torque
-    float _gyro[3];
-    float _torque[3];
+    float _gyro[3] {0,0,0};
+    float _torque[3] {0,0,0};
 
     State* _s;
-    bool _crashed;
-    float _agl;
+    bool _crashed {false};
+    float _agl {0};
     SGPropertyNode_ptr _modelN;  
     SGPropertyNode_ptr _fAeroXN;
     SGPropertyNode_ptr _fAeroYN;