diff --git a/src/capture_laser_2D.cpp b/src/capture_laser_2D.cpp
index 6c35f216f19619e114047d2a096df91bf29b9a88..8d1a4ffeaccf3858608644ad16a39d68c5571dfb 100644
--- a/src/capture_laser_2D.cpp
+++ b/src/capture_laser_2D.cpp
@@ -3,12 +3,7 @@
 namespace wolf {
 
 CaptureLaser2D::CaptureLaser2D(const TimeStamp& _ts, SensorBasePtr _sensor_ptr, const std::vector<float>& _ranges) :
-        CaptureBase("LASER 2D", _ts, _sensor_ptr), laser_ptr_(std::static_pointer_cast<SensorLaser2D>(sensor_ptr_.lock())), scan_(_ranges)
-{
-    //
-}
-
-CaptureLaser2D::~CaptureLaser2D()
+        CaptureBase("LASER 2D", _ts, _sensor_ptr), laser_ptr_(std::static_pointer_cast<SensorLaser2D>(getSensorPtr())), scan_(_ranges)
 {
     //
 }
diff --git a/src/capture_laser_2D.h b/src/capture_laser_2D.h
index 3a0612860c08862a890ea43495f12089c7a86114..f1cbf9eae7810b1e70341de0bec2709d524271fc 100644
--- a/src/capture_laser_2D.h
+++ b/src/capture_laser_2D.h
@@ -17,16 +17,16 @@ class SensorLaser2D;
 namespace wolf {
 
 WOLF_PTR_TYPEDEFS(CaptureLaser2D);
-    
-    
+
+
 class CaptureLaser2D : public CaptureBase
 {
     public:
         /** \brief Constructor with ranges
          **/
         CaptureLaser2D(const TimeStamp& _ts, SensorBasePtr _sensor_ptr, const std::vector<float>& _ranges);
-        virtual ~CaptureLaser2D();
-        
+        virtual ~CaptureLaser2D() = default;
+
         laserscanutils::LaserScan& getScan();
 
         void setSensorPtr(const SensorBasePtr sensor_ptr);