diff --git a/src/widgets/gcodeeditorwidget.cpp b/src/widgets/gcodeeditorwidget.cpp
index 7262914..a16b9b9 100644
--- a/src/widgets/gcodeeditorwidget.cpp
+++ b/src/widgets/gcodeeditorwidget.cpp
@@ -1,142 +1,142 @@
 /* Atelier KDE Printer Host for 3D Printing
     Copyright (C) <2016>
     Author: Lays Rodrigues - lays.rodrigues@kde.org
             Chris Rizzitello - rizzitello@kde.org
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include <KLocalizedString>
 #include <QDropEvent>
 #include <QLabel>
 #include <QMimeData>
 #include <QVBoxLayout>
 #include "gcodeeditorwidget.h"
 
 GCodeEditorWidget::GCodeEditorWidget(QWidget *parent) :
     QWidget(parent)
-    , m_tabwidget(new QTabWidget())
+    , m_tabwidget(new QTabWidget(this))
 {
     setAcceptDrops(true);
     m_editor = KTextEditor::Editor::instance();
     setupTabWidget();
-    QVBoxLayout *layout = new QVBoxLayout();
+    auto layout = new QVBoxLayout();
     layout->addWidget(m_tabwidget);
     setLayout(layout);
 }
 
 void GCodeEditorWidget::setupTabWidget()
 {
     connect(m_tabwidget, &QTabWidget::tabCloseRequested, this, &GCodeEditorWidget::closeTab);
     connect(m_tabwidget, &QTabWidget::currentChanged, this, &GCodeEditorWidget::currentIndexChanged);
     m_tabwidget->setTabsClosable(true);
 }
 
 void GCodeEditorWidget::loadFile(const QUrl &file)
 {
     //if the file is loaded then reload the document.
     if (urlDoc.contains(file)) {
         urlDoc[file]->documentReload();
         m_tabwidget->setCurrentIndex(m_tabwidget->indexOf(urlTab[file]));
         return;
     }
     auto doc = newDoc(file);
     int t = m_tabwidget->addTab(newView(doc), file.fileName());
     urlDoc[doc->url()] = doc;
     urlTab[doc->url()] = m_tabwidget->widget(t);
     //connect our new document's modified state changed signal.
     connect(doc, &KTextEditor::Document::modifiedChanged, this, [this, t](const KTextEditor::Document * document) {
         QString filename = document->url().fileName(QUrl::FullyDecoded);
         if (document->isModified()) {
             filename.append(" *");
         }
         m_tabwidget->setTabText(t, filename);
     });
     m_tabwidget->setCurrentIndex(t);
 }
 
 void GCodeEditorWidget::setupInterface(const KTextEditor::View *view)
 {
     m_interface = qobject_cast<KTextEditor::ConfigInterface *>(view);
     m_interface->setConfigValue("line-numbers", true);
     m_interface->setConfigValue("dynamic-word-wrap", false);
     m_interface->setConfigValue("modification-markers", true);
     m_interface->setConfigValue("scrollbar-minimap", false);
 }
 
 KTextEditor::Document *GCodeEditorWidget::newDoc(const QUrl &file)
 {
     KTextEditor::Document *doc = m_editor->createDocument(this);
     doc->setMode("G-Code");
     doc->openUrl(file);
     doc->setHighlightingMode(QString("G-Code"));
     return doc;
 }
 
 KTextEditor::View *GCodeEditorWidget::newView(KTextEditor::Document *doc)
 {
     auto view = doc->createView(this);
     // Connection is a hack using undocumented parts of KTextEditor::View.
     // One day this may break, KTextEditor::View needs this added correctly as a real slot to the API.
     // Hopefully we can get that added and use it in the future.
     // This must be the older style connect string or it will not work.
     connect(view, SIGNAL(dropEventPass(QDropEvent *)), this, SLOT(dropCatch(QDropEvent *)));
     setupInterface(view);
     return view;
 }
 
 void GCodeEditorWidget::closeTab(int index)
 {
     QUrl url = urlTab.key(m_tabwidget->widget(index));
     auto doc = urlDoc[url];
     if (doc->closeUrl()) {
         m_tabwidget->removeTab(index);
         urlTab.remove(url);
         urlDoc.remove(url);
         emit fileClosed(url);
     }
 }
 
 void GCodeEditorWidget::currentIndexChanged(int index)
 {
     emit currentFileChanged(urlTab.key(m_tabwidget->widget(index)));
     emit updateClientFactory(qobject_cast<KTextEditor::View *>(m_tabwidget->widget(index)));
 }
 
 void GCodeEditorWidget::dropCatch(QDropEvent *event)
 {
     if (event->mimeData()->hasUrls()) {
         emit droppedUrls(event->mimeData()->urls());
     }
 
 }
 
 QVector<QUrl> GCodeEditorWidget::modifiedFiles()
 {
     QVector<QUrl> modList;
     for (auto const &doc : m_editor->documents()) {
         if (doc->isModified()) {
             modList.append(doc->url());
         }
     }
     return modList;
 }
 
 bool GCodeEditorWidget::saveFile(const QUrl &url)
 {
     if (!urlDoc.contains(url)) {
         return false;
     }
     KTextEditor::Document *doc = urlDoc[url];
     return doc->save();
 }
diff --git a/src/widgets/gcodeeditorwidget.h b/src/widgets/gcodeeditorwidget.h
index 37fc72c..f2b8398 100644
--- a/src/widgets/gcodeeditorwidget.h
+++ b/src/widgets/gcodeeditorwidget.h
@@ -1,58 +1,59 @@
 /* Atelier KDE Printer Host for 3D Printing
     Copyright (C) <2016>
     Author: Lays Rodrigues - lays.rodrigues@kde.org
             Chris Rizzitello - rizzitello@kde.org
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 
 #include <KTextEditor/ConfigInterface>
 #include <KTextEditor/Document>
 #include <KTextEditor/Editor>
 #include <KTextEditor/View>
 #include <QTabWidget>
 #include <QWidget>
 
 class GCodeEditorWidget : public QWidget
 {
     Q_OBJECT
 public:
     explicit GCodeEditorWidget(QWidget *parent = nullptr);
+    ~GCodeEditorWidget() = default;
     void loadFile(const QUrl &file);
     QVector<QUrl> modifiedFiles();
     bool saveFile(const QUrl &url);
 
 private:
     QMap<QUrl, KTextEditor::Document *> urlDoc;
     QMap<QUrl, QWidget *> urlTab;
-    KTextEditor::ConfigInterface *m_interface;
+    KTextEditor::ConfigInterface *m_interface = nullptr;
     KTextEditor::Document *newDoc(const QUrl &file);
     KTextEditor::Editor *m_editor;
     KTextEditor::View *newView(KTextEditor::Document *doc);
     QTabWidget *m_tabwidget;
     void closeTab(int index);
     void currentIndexChanged(int index);
     void setupInterface(const KTextEditor::View *view);
     void setupTabWidget();
 
 signals:
     void currentFileChanged(const QUrl &file);
     void updateClientFactory(KTextEditor::View *view);
     void fileClosed(const QUrl &file);
     void droppedUrls(QList<QUrl> fileList);
 
 private slots:
     void dropCatch(QDropEvent *event);
 };