diff --git a/src/Editor/WorldEditor/CLayerEditor.cpp b/src/Editor/WorldEditor/CLayerEditor.cpp
index c2363612..ceb1e0e4 100644
--- a/src/Editor/WorldEditor/CLayerEditor.cpp
+++ b/src/Editor/WorldEditor/CLayerEditor.cpp
@@ -6,9 +6,8 @@
 
 CLayerEditor::CLayerEditor(QWidget *parent)
     : QDialog(parent)
-    , ui(new Ui::CLayerEditor)
-    , mpArea(nullptr)
     , mpModel(new CLayerModel(this))
+    , ui(std::make_unique<Ui::CLayerEditor>())
 {
     ui->setupUi(this);
     ui->LayerSelectComboBox->setModel(mpModel);
@@ -18,10 +17,7 @@ CLayerEditor::CLayerEditor(QWidget *parent)
     connect(ui->ActiveCheckBox, SIGNAL(toggled(bool)), this, SLOT(EditLayerActive(bool)));
 }
 
-CLayerEditor::~CLayerEditor()
-{
-    delete ui;
-}
+CLayerEditor::~CLayerEditor() = default;
 
 void CLayerEditor::SetArea(CGameArea *pArea)
 {
diff --git a/src/Editor/WorldEditor/CLayerEditor.h b/src/Editor/WorldEditor/CLayerEditor.h
index 352de01c..fccffa99 100644
--- a/src/Editor/WorldEditor/CLayerEditor.h
+++ b/src/Editor/WorldEditor/CLayerEditor.h
@@ -13,10 +13,10 @@ class CLayerEditor : public QDialog
     Q_OBJECT
     TResPtr<CGameArea> mpArea;
     CLayerModel *mpModel;
-    CScriptLayer *mpCurrentLayer;
+    CScriptLayer *mpCurrentLayer = nullptr;
 
 public:
-    explicit CLayerEditor(QWidget *parent = 0);
+    explicit CLayerEditor(QWidget *parent = nullptr);
     ~CLayerEditor();
     void SetArea(CGameArea *pArea);
 
@@ -26,7 +26,7 @@ public slots:
     void EditLayerActive(bool Active);
 
 private:
-    Ui::CLayerEditor *ui;
+    std::unique_ptr<Ui::CLayerEditor> ui;
 };
 
 #endif // CLAYEREDITOR_H