diff --git a/GUI/coregui/Views/ImportDataWidgets/RealDataSelectorWidget.cpp b/GUI/coregui/Views/ImportDataWidgets/RealDataSelectorWidget.cpp
index 2bd259285fdeb450810c5292a889b152e27afc9b..3fe71ff5773988b2e2d301eeb447143304d93f54 100644
--- a/GUI/coregui/Views/ImportDataWidgets/RealDataSelectorWidget.cpp
+++ b/GUI/coregui/Views/ImportDataWidgets/RealDataSelectorWidget.cpp
@@ -18,13 +18,12 @@
 #include "ItemSelectorWidget.h"
 #include "RealDataPropertiesWidget.h"
 #include "RealDataModel.h"
-#include "LinkInstrumentManager.h"
 #include "minisplitter.h"
 #include "ImportDataToolBar.h"
 #include <QVBoxLayout>
 #include <QItemSelectionModel>
 
-RealDataSelectorWidget::RealDataSelectorWidget(QWidget *parent)
+RealDataSelectorWidget::RealDataSelectorWidget(QWidget* parent)
     : QWidget(parent)
     , m_toolBar(new ImportDataToolBar(this))
     , m_splitter(new Manhattan::MiniSplitter)
@@ -40,37 +39,41 @@ RealDataSelectorWidget::RealDataSelectorWidget(QWidget *parent)
     m_splitter->addWidget(m_propertiesWidget);
     m_splitter->setChildrenCollapsible(true);
 
-    QVBoxLayout *mainLayout = new QVBoxLayout;
+    auto mainLayout = new QVBoxLayout;
     mainLayout->setMargin(0);
     mainLayout->setSpacing(0);
-    mainLayout->setContentsMargins(0,0,0,0);
+    mainLayout->setContentsMargins(0, 0, 0, 0);
     mainLayout->addWidget(m_toolBar);
     mainLayout->addWidget(m_splitter);
     setLayout(mainLayout);
 
-    connect(m_selectorWidget, SIGNAL(selectionChanged(SessionItem *)),
-        this, SLOT(onSelectionChanged(SessionItem *)));
+    connect(m_selectorWidget, &ItemSelectorWidget::selectionChanged,
+            this, &RealDataSelectorWidget::onSelectionChanged);
+}
+
+QSize RealDataSelectorWidget::sizeHint() const
+{
+    return QSize(200, 400);
+}
 
+QSize RealDataSelectorWidget::minimumSizeHint() const
+{
+    return QSize(128, 200);
 }
 
-void RealDataSelectorWidget::setModels(InstrumentModel *instrumentModel,
-                                       RealDataModel *realDataModel)
+void RealDataSelectorWidget::setModels(InstrumentModel* instrumentModel,
+                                       RealDataModel* realDataModel)
 {
     m_selectorWidget->setModel(realDataModel);
     m_propertiesWidget->setModels(instrumentModel, realDataModel);
 
     m_toolBar->setRealDataModel(realDataModel);
     m_toolBar->setInstrumentModel(instrumentModel);
-    m_toolBar->setSelectionModel(selectionModel());
-}
-
-QItemSelectionModel *RealDataSelectorWidget::selectionModel()
-{
-    return m_selectorWidget->selectionModel();
+    m_toolBar->setSelectionModel(m_selectorWidget->selectionModel());
 }
 
-void RealDataSelectorWidget::onSelectionChanged(SessionItem *item)
+void RealDataSelectorWidget::onSelectionChanged(SessionItem* item)
 {
-   m_propertiesWidget->setItem(item);
-   emit selectionChanged(item);
+    m_propertiesWidget->setItem(item);
+    emit selectionChanged(item);
 }
diff --git a/GUI/coregui/Views/ImportDataWidgets/RealDataSelectorWidget.h b/GUI/coregui/Views/ImportDataWidgets/RealDataSelectorWidget.h
index 1a2a0ec1b6a343c40a22e1538200cf181e0c95bf..e81b8cede074f62c11183e086722939d6d01b59f 100644
--- a/GUI/coregui/Views/ImportDataWidgets/RealDataSelectorWidget.h
+++ b/GUI/coregui/Views/ImportDataWidgets/RealDataSelectorWidget.h
@@ -26,7 +26,6 @@ class RealDataPropertiesWidget;
 class InstrumentModel;
 class RealDataModel;
 class SessionItem;
-class QItemSelectionModel;
 class ImportDataToolBar;
 namespace Manhattan { class MiniSplitter;}
 
@@ -39,26 +38,24 @@ class BA_CORE_API_ RealDataSelectorWidget : public QWidget
     Q_OBJECT
 
 public:
-    RealDataSelectorWidget(QWidget *parent = 0);
+    RealDataSelectorWidget(QWidget* parent = 0);
 
-    QSize sizeHint() const { return QSize(200, 400); }
-    QSize minimumSizeHint() const { return QSize(128, 200); }
+    QSize sizeHint() const;
+    QSize minimumSizeHint() const;
 
-    void setModels(InstrumentModel *instrumentModel, RealDataModel *realDataModel);
-
-    QItemSelectionModel *selectionModel();
+    void setModels(InstrumentModel* instrumentModel, RealDataModel* realDataModel);
 
 signals:
-    void selectionChanged(SessionItem *);
+    void selectionChanged(SessionItem*);
 
 public slots:
-    void onSelectionChanged(SessionItem *item);
+    void onSelectionChanged(SessionItem* item);
 
 private:
     ImportDataToolBar* m_toolBar;
-    Manhattan::MiniSplitter *m_splitter;
-    ItemSelectorWidget *m_selectorWidget;
-    RealDataPropertiesWidget *m_propertiesWidget;
+    Manhattan::MiniSplitter* m_splitter;
+    ItemSelectorWidget* m_selectorWidget;
+    RealDataPropertiesWidget* m_propertiesWidget;
 };
 
 #endif // REALDATASELECTORWIDGET_H