diff --git a/mixxx/src/analyserqueue.cpp b/mixxx/src/analyserqueue.cpp
index f27d57a271b7..c62c1bb8db73 100644
--- a/mixxx/src/analyserqueue.cpp
+++ b/mixxx/src/analyserqueue.cpp
@@ -181,7 +181,7 @@ bool AnalyserQueue::doAnalysis(TrackPointer tio, SoundSourceProxy* pSoundSource)
             dieflag = true;
         }
 
-        for (int i = 0; i < read; i++) {
+        for (int i = 0; i < read; ++i) {
             samples[i] = ((float)data16[i])/32767.0f;
         }
 
diff --git a/mixxx/src/dlgautodj.cpp b/mixxx/src/dlgautodj.cpp
index f8d954495f48..3da32d7d6f8e 100644
--- a/mixxx/src/dlgautodj.cpp
+++ b/mixxx/src/dlgautodj.cpp
@@ -89,7 +89,7 @@ DlgAutoDJ::DlgAutoDJ(QWidget* parent, ConfigObject<ConfigValue>* pConfig,
             this, SLOT(transitionValueChanged(int)));
 
     connect(pushButtonAutoDJ, SIGNAL(toggled(bool)),
-            this,  SLOT(toggleAutoDJButton(bool))); _blah;
+            this, SLOT(toggleAutoDJButton(bool))); _blah;
 
     m_pCOEnabledAutoDJ = new ControlPushButton(
             ConfigKey("[AutoDJ]", "enabled"));
diff --git a/mixxx/src/dlgprefplaylist.cpp b/mixxx/src/dlgprefplaylist.cpp
index 192cbe3c6572..e00cae717fcc 100644
--- a/mixxx/src/dlgprefplaylist.cpp
+++ b/mixxx/src/dlgprefplaylist.cpp
@@ -15,20 +15,22 @@
 *                                                                         *
 ***************************************************************************/
 
+#include <QUrl>
+#include <QDesktopServices>
+#include <QFileDialog>
 #include "dlgprefplaylist.h"
 #ifdef __PROMO__
 #include "library/promotracksfeature.h"
 #endif
 #include "soundsourceproxy.h"
 //#include "plugindownloader.h"
-#include <QtCore>
-#include <QtGui>
 
 #define MIXXX_ADDONS_URL "http://www.mixxx.org/wiki/doku.php/add-ons"
 
-DlgPrefPlaylist::DlgPrefPlaylist(QWidget * parent, ConfigObject<ConfigValue> * _config)
-        :  QWidget(parent) {
-    config = _config;
+
+DlgPrefPlaylist::DlgPrefPlaylist(QWidget * parent, ConfigObject<ConfigValue> * config)
+            : QWidget(parent), 
+              m_pconfig(config) {
     setupUi(this);
     slotUpdate();
     checkbox_ID3_sync->setVisible(false);
@@ -47,11 +49,11 @@ DlgPrefPlaylist::DlgPrefPlaylist(QWidget * parent, ConfigObject<ConfigValue> * _
             this, SLOT(slotM4ADownloadProgress(qint64, qint64)));
     */
 
-    // Connection
-    connect(PushButtonBrowsePlaylist, SIGNAL(clicked()),       this,      SLOT(slotBrowseDir()));
-    connect(LineEditSongfiles,        SIGNAL(returnPressed()), this,      SLOT(slotApply()));
+    connect(PushButtonBrowsePlaylist, SIGNAL(clicked()),
+            this, SLOT(slotBrowseDir()));
     //connect(pushButtonM4A, SIGNAL(clicked()), this, SLOT(slotM4ACheck()));
-    connect(pushButtonExtraPlugins, SIGNAL(clicked()), this, SLOT(slotExtraPlugins()));
+    connect(pushButtonExtraPlugins, SIGNAL(clicked()),
+            this, SLOT(slotExtraPlugins()));
 
     bool enablePromoGroupbox = false;
 #ifdef __PROMO__
@@ -69,12 +71,10 @@ DlgPrefPlaylist::DlgPrefPlaylist(QWidget * parent, ConfigObject<ConfigValue> * _
     }
 }
 
-DlgPrefPlaylist::~DlgPrefPlaylist()
-{
+DlgPrefPlaylist::~DlgPrefPlaylist() {
 }
 
-void DlgPrefPlaylist::slotExtraPlugins()
-{
+void DlgPrefPlaylist::slotExtraPlugins() {
     QDesktopServices::openUrl(QUrl(MIXXX_ADDONS_URL));
 }
 
@@ -140,67 +140,56 @@ void DlgPrefPlaylist::slotM4ACheck()
     }
 }*/
 
-void DlgPrefPlaylist::slotUpdate()
-{
-    // Song path
-    LineEditSongfiles->setText(config->getValueString(ConfigKey("[Playlist]","Directory")));
+void DlgPrefPlaylist::slotUpdate() {
+    // Library Path
+    LineEditSongfiles->setText(m_pconfig->getValueString(
+                               ConfigKey("[Playlist]","Directory")));
     //Bundled songs stat tracking
-    checkBoxPromoStats->setChecked((bool)config->getValueString(ConfigKey("[Promo]","StatTracking")).toInt());
-    checkBox_library_scan->setChecked((bool)config->getValueString(ConfigKey("[Library]","RescanOnStartup")).toInt());
-    checkbox_ID3_sync->setChecked((bool)config->getValueString(ConfigKey("[Library]","WriteAudioTags")).toInt());
-    checkBox_use_relative_path->setChecked((bool)config->getValueString(ConfigKey("[Library]","UseRelativePathOnExport")).toInt());
-    checkBox_show_rhythmbox->setChecked((bool)config->getValueString(ConfigKey("[Library]","ShowRhythmboxLibrary"),"1").toInt());
-    checkBox_show_itunes->setChecked((bool)config->getValueString(ConfigKey("[Library]","ShowITunesLibrary"),"1").toInt());
-    checkBox_show_traktor->setChecked((bool)config->getValueString(ConfigKey("[Library]","ShowTraktorLibrary"),"1").toInt());
+    checkBoxPromoStats->setChecked((bool)m_pconfig->getValueString(
+            ConfigKey("[Promo]","StatTracking")).toInt());
+    checkBox_library_scan->setChecked((bool)m_pconfig->getValueString(
+            ConfigKey("[Library]","RescanOnStartup")).toInt());
+    checkbox_ID3_sync->setChecked((bool)m_pconfig->getValueString(
+            ConfigKey("[Library]","WriteAudioTags")).toInt());
+    checkBox_use_relative_path->setChecked((bool)m_pconfig->getValueString(
+            ConfigKey("[Library]","UseRelativePathOnExport")).toInt());
+    checkBox_show_rhythmbox->setChecked((bool)m_pconfig->getValueString(
+            ConfigKey("[Library]","ShowRhythmboxLibrary"),"1").toInt());
+    checkBox_show_itunes->setChecked((bool)m_pconfig->getValueString(
+            ConfigKey("[Library]","ShowITunesLibrary"),"1").toInt());
+    checkBox_show_traktor->setChecked((bool)m_pconfig->getValueString(
+            ConfigKey("[Library]","ShowTraktorLibrary"),"1").toInt());
 }
 
-void DlgPrefPlaylist::slotBrowseDir()
-{
-    QString fd = QFileDialog::getExistingDirectory(this, tr("Choose music library directory"),
-                                                   config->getValueString(ConfigKey("[Playlist]","Directory")));
-    if (fd != "")
-    {
+void DlgPrefPlaylist::slotBrowseDir() {
+    QString fd = QFileDialog::getExistingDirectory(this,
+                 tr("Choose music library directory"),
+                 m_pconfig->getValueString(ConfigKey("[Playlist]","Directory")));
+    if (fd != "") {
         LineEditSongfiles->setText(fd);
     }
 }
 
-void DlgPrefPlaylist::slotApply()
-{
-
-    config->set(ConfigKey("[Promo]","StatTracking"),
+void DlgPrefPlaylist::slotApply() {
+    m_pconfig->set(ConfigKey("[Promo]","StatTracking"),
                 ConfigValue((int)checkBoxPromoStats->isChecked()));
-
-    config->set(ConfigKey("[Library]","RescanOnStartup"),
+    m_pconfig->set(ConfigKey("[Library]","RescanOnStartup"),
                 ConfigValue((int)checkBox_library_scan->isChecked()));
-
-    config->set(ConfigKey("[Library]","WriteAudioTags"),
+    m_pconfig->set(ConfigKey("[Library]","WriteAudioTags"),
                 ConfigValue((int)checkbox_ID3_sync->isChecked()));
-
-    config->set(ConfigKey("[Library]","UseRelativePathOnExport"),
+    m_pconfig->set(ConfigKey("[Library]","UseRelativePathOnExport"),
                 ConfigValue((int)checkBox_use_relative_path->isChecked()));
-
-    config->set(ConfigKey("[Library]","ShowRhythmboxLibrary"),
+    m_pconfig->set(ConfigKey("[Library]","ShowRhythmboxLibrary"),
                 ConfigValue((int)checkBox_show_rhythmbox->isChecked()));
-
-    config->set(ConfigKey("[Library]","ShowITunesLibrary"),
+    m_pconfig->set(ConfigKey("[Library]","ShowITunesLibrary"),
                 ConfigValue((int)checkBox_show_itunes->isChecked()));
-
-    config->set(ConfigKey("[Library]","ShowTraktorLibrary"),
+    m_pconfig->set(ConfigKey("[Library]","ShowTraktorLibrary"),
                 ConfigValue((int)checkBox_show_traktor->isChecked()));
 
-    config->Save();
-
-    // Update playlist if path has changed
-    if (LineEditSongfiles->text() != config->getValueString(ConfigKey("[Playlist]","Directory")))
-    {
-        // Check for valid directory and put up a dialog if invalid!!!
-
-        config->set(ConfigKey("[Playlist]","Directory"), LineEditSongfiles->text());
-
-        // Save preferences
-        config->Save();
-
-        // Emit apply signal
+    if (LineEditSongfiles->text() !=
+            m_pconfig->getValueString(ConfigKey("[Playlist]","Directory"))) {
+        m_pconfig->set(ConfigKey("[Playlist]","Directory"), LineEditSongfiles->text());
         emit(apply());
     }
+    m_pconfig->Save();
 }
diff --git a/mixxx/src/dlgprefplaylist.h b/mixxx/src/dlgprefplaylist.h
index 6fc37ebdb425..c52d85beb0da 100644
--- a/mixxx/src/dlgprefplaylist.h
+++ b/mixxx/src/dlgprefplaylist.h
@@ -22,40 +22,41 @@
 #include "configobject.h"
 
 class QWidget;
+
 /**
   *@author Tue & Ken Haste Andersen
   */
 
 class DlgPrefPlaylist : public QWidget, public Ui::DlgPrefPlaylistDlg  {
     Q_OBJECT
-public:
-    DlgPrefPlaylist(QWidget *parent, ConfigObject<ConfigValue> *_config);
+  public:
+    DlgPrefPlaylist(QWidget *parent, ConfigObject<ConfigValue> *config);
     ~DlgPrefPlaylist();
-public slots:
-    /** Update widget */
+  public slots:
+    // Update widget 
     void slotUpdate();
-    /** Dialog to browse for music file directory */
+    // Dialog to browse for music file directory 
     void slotBrowseDir();
-    /** Apply changes to widget */
+    // Apply changes to widget 
     void slotApply();
-    /** Starts up the PluginDownloader if the plugin isn't present */
+    // Starts up the PluginDownloader if the plugin isn't present
     //void slotM4ACheck();
-    /** Set the label and enabled state on the M4A button
-        depending on whether the M4A plugin is installed. */
+    // Set the label and enabled state on the M4A button
+    // depending on whether the M4A plugin is installed.
     //void setupM4AButton(bool forceInstalled=false);
-    /** Display UI indication of plugin download progress.*/
+    // Display UI indication of plugin download progress.
     //void slotM4ADownloadProgress(qint64, qint64);
-    /** M4A plugin download is finished... */
+    // M4A plugin download is finished...
     //void slotM4ADownloadFinished();
 
     void slotExtraPlugins();
 
-signals:
+  signals:
     void apply();
-private:
-    /** Pointer to config object */
-    ConfigObject<ConfigValue> *config;
-    /** SoundSource Plugin Downloader */
+
+  private:
+    ConfigObject<ConfigValue> *m_pconfig;
+    // SoundSource Plugin Downloader
     //PluginDownloader* m_pPluginDownloader;
 };
 
diff --git a/mixxx/src/dlgprepare.cpp b/mixxx/src/dlgprepare.cpp
index 8edbf9f93900..a7c6b4fcfae6 100644
--- a/mixxx/src/dlgprepare.cpp
+++ b/mixxx/src/dlgprepare.cpp
@@ -34,7 +34,8 @@ DlgPrepare::DlgPrepare(QWidget* parent,
     m_pTrackTablePlaceholder->hide();
     box->insertWidget(1, m_pPrepareLibraryTableView);
 
-    m_pPrepareLibraryTableModel =  new PrepareLibraryTableModel(this, pTrackCollection);
+    m_pPrepareLibraryTableModel =  new PrepareLibraryTableModel(this,
+                                    pTrackCollection);
     m_pPrepareLibraryTableView->loadTrackModel(m_pPrepareLibraryTableModel);
 
 /*
diff --git a/mixxx/src/library/cratefeature.h b/mixxx/src/library/cratefeature.h
index 26079d598585..e54a97d6f7ef 100644
--- a/mixxx/src/library/cratefeature.h
+++ b/mixxx/src/library/cratefeature.h
@@ -17,7 +17,9 @@ class TrackCollection;
 class CrateFeature : public LibraryFeature {
     Q_OBJECT
   public:
-    CrateFeature(QObject* parent, TrackCollection* pTrackCollection, ConfigObject<ConfigValue>* pConfig);
+    CrateFeature(QObject* parent, 
+                 TrackCollection* pTrackCollection, 
+                 ConfigObject<ConfigValue>* pConfig);
     virtual ~CrateFeature();
 
     QVariant title();
diff --git a/mixxx/src/library/hiddentablemodel.h b/mixxx/src/library/hiddentablemodel.h
index 55b798ff6fc7..51d8b37fcbd9 100644
--- a/mixxx/src/library/hiddentablemodel.h
+++ b/mixxx/src/library/hiddentablemodel.h
@@ -1,12 +1,6 @@
 #ifndef HIDDENTABLEMODEL_H
 #define HIDDENTABLEMODEL_H
 
-#include <QtSql>
-#include <QItemDelegate>
-#include <QtCore>
-
-#include "trackmodel.h"
-#include "library/dao/trackdao.h"
 #include "library/basesqltablemodel.h"
 
 class TrackCollection;
@@ -16,13 +10,13 @@ class HiddenTableModel : public BaseSqlTableModel {
   public:
     HiddenTableModel(QObject* parent, TrackCollection* pTrackCollection);
     virtual ~HiddenTableModel();
-    virtual TrackPointer getTrack(const QModelIndex& index) const;
-    virtual void search(const QString& searchText);
-    virtual bool isColumnInternal(int column);
-    virtual bool isColumnHiddenByDefault(int column);
-    virtual void purgeTracks(const QModelIndexList& indices);
-    virtual void unhideTracks(const QModelIndexList& indices);
-    virtual bool addTrack(const QModelIndex& index, QString location);
+    TrackPointer getTrack(const QModelIndex& index) const;
+    void search(const QString& searchText);
+    bool isColumnInternal(int column);
+    bool isColumnHiddenByDefault(int column);
+    void purgeTracks(const QModelIndexList& indices);
+    void unhideTracks(const QModelIndexList& indices);
+    bool addTrack(const QModelIndex& index, QString location);
 
     Qt::ItemFlags flags(const QModelIndex &index) const;
     TrackModel::CapabilitiesFlags getCapabilities() const;
diff --git a/mixxx/src/library/library.cpp b/mixxx/src/library/library.cpp
index 2f5daf28387b..e06decbb5798 100644
--- a/mixxx/src/library/library.cpp
+++ b/mixxx/src/library/library.cpp
@@ -217,19 +217,16 @@ void Library::slotRestoreSearch(const QString& text) {
     emit(restoreSearch(text));
 }
 
-void Library::slotRefreshLibraryModels()
-{
+void Library::slotRefreshLibraryModels() {
    m_pMixxxLibraryFeature->refreshLibraryModels();
    m_pPrepareFeature->refreshLibraryModels();
 }
 
-void Library::slotCreatePlaylist()
-{
+void Library::slotCreatePlaylist() {
     m_pPlaylistFeature->slotCreatePlaylist();
 }
 
-void Library::slotCreateCrate()
-{
+void Library::slotCreateCrate() {
     m_pCrateFeature->slotCreateCrate();
 }
 
diff --git a/mixxx/src/library/librarytablemodel.h b/mixxx/src/library/librarytablemodel.h
index 51dc8c561041..654b680030b8 100644
--- a/mixxx/src/library/librarytablemodel.h
+++ b/mixxx/src/library/librarytablemodel.h
@@ -17,15 +17,15 @@ class LibraryTableModel : public BaseSqlTableModel {
                       QString settingsNamespace="mixxx.db.model.library");
     virtual ~LibraryTableModel();
 
-    virtual TrackPointer getTrack(const QModelIndex& index) const;
-    virtual void search(const QString& searchText);
-    virtual bool isColumnInternal(int column);
-    virtual bool isColumnHiddenByDefault(int column);
-    virtual bool addTrack(const QModelIndex& index, QString location);
+    TrackPointer getTrack(const QModelIndex& index) const;
+    void search(const QString& searchText);
+    bool isColumnInternal(int column);
+    bool isColumnHiddenByDefault(int column);
+    bool addTrack(const QModelIndex& index, QString location);
     // Takes a list of locations and add the tracks to the library. Returns the
     // number of successful additions.
-    virtual int addTracks(const QModelIndex& index, QList<QString> locations);
-    virtual void moveTrack(const QModelIndex& sourceIndex,
+    int addTracks(const QModelIndex& index, QList<QString> locations);
+    void moveTrack(const QModelIndex& sourceIndex,
                            const QModelIndex& destIndex);
     TrackModel::CapabilitiesFlags getCapabilities() const;
     static const QString DEFAULT_LIBRARYFILTER;
diff --git a/mixxx/src/library/playlistfeature.h b/mixxx/src/library/playlistfeature.h
index e92a0eb0d6b5..445da63dc29b 100644
--- a/mixxx/src/library/playlistfeature.h
+++ b/mixxx/src/library/playlistfeature.h
@@ -37,7 +37,7 @@ class PlaylistFeature : public BasePlaylistFeature {
     void decorateChild(TreeItem *pChild, int playlist_id);
 
   private:
-    virtual QString getRootViewHtml() const;
+    QString getRootViewHtml() const;
 };
 
 #endif /* PLAYLISTFEATURE_H */
diff --git a/mixxx/src/library/setlogfeature.h b/mixxx/src/library/setlogfeature.h
index 1a55e7c48ce9..9363ab9e2e6c 100644
--- a/mixxx/src/library/setlogfeature.h
+++ b/mixxx/src/library/setlogfeature.h
@@ -42,7 +42,7 @@ class SetlogFeature : public BasePlaylistFeature {
 
 
   private:
-    virtual QString getRootViewHtml() const;
+    QString getRootViewHtml() const;
 
     QLinkedList<int> m_recentTracks;
     QAction *m_pJoinWithPreviousAction;
diff --git a/mixxx/src/library/treeitem.cpp b/mixxx/src/library/treeitem.cpp
index 91cf762a1e48..2af1ca0524f9 100644
--- a/mixxx/src/library/treeitem.cpp
+++ b/mixxx/src/library/treeitem.cpp
@@ -29,7 +29,8 @@
  * - cratefeature.cpp
  * - *feature.cpp
  */
-TreeItem::TreeItem(const QString &data, const QString &data_path, LibraryFeature* feature, TreeItem* parent) {
+TreeItem::TreeItem(const QString &data, const QString &data_path,
+                   LibraryFeature* feature, TreeItem* parent) {
     m_data = data;
     m_dataPath = data_path;
     m_parentItem = parent;
diff --git a/mixxx/src/library/treeitemmodel.cpp b/mixxx/src/library/treeitemmodel.cpp
index 11b4721f39ec..9d68669a58d7 100644
--- a/mixxx/src/library/treeitemmodel.cpp
+++ b/mixxx/src/library/treeitemmodel.cpp
@@ -28,14 +28,12 @@
  * - *feature.cpp
  */
 TreeItemModel::TreeItemModel(QObject *parent)
-        : QAbstractItemModel(parent) {
-
-    m_rootItem = new TreeItem();
-
+        : QAbstractItemModel(parent),
+          m_prootItem(new TreeItem()) {
 }
 
 TreeItemModel::~TreeItemModel() {
-    delete m_rootItem;
+    delete m_prootItem;
 }
 
 //Our Treeview Model supports exactly a single column
@@ -81,7 +79,7 @@ QModelIndex TreeItemModel::index(int row, int column, const QModelIndex &parent)
     TreeItem *parentItem = NULL;
 
     if (!parent.isValid())
-        parentItem = m_rootItem;
+        parentItem = m_prootItem;
     else
         parentItem = static_cast<TreeItem*>(parent.internalPointer());
 
@@ -99,7 +97,7 @@ QModelIndex TreeItemModel::parent(const QModelIndex &index) const {
     TreeItem *childItem = static_cast<TreeItem*>(index.internalPointer());
     TreeItem *parentItem = childItem->parent();
 
-    if (parentItem == m_rootItem)
+    if (parentItem == m_prootItem)
         return QModelIndex();
 
     return createIndex(parentItem->row(), 0, parentItem);
@@ -112,7 +110,7 @@ int TreeItemModel::rowCount(const QModelIndex &parent) const {
     TreeItem *parentItem = NULL;
     //qDebug() << "parent data: " << parent.data();
     if (!parent.isValid()){
-        parentItem = m_rootItem;
+        parentItem = m_prootItem;
     }
     else{
         parentItem = static_cast<TreeItem*>(parent.internalPointer());
@@ -129,9 +127,9 @@ int TreeItemModel::rowCount(const QModelIndex &parent) const {
  * Call this method first, before you do call any other methods.
  */
 void TreeItemModel::setRootItem(TreeItem *item) {
-    if(m_rootItem) delete m_rootItem;
+    if(m_prootItem) delete m_prootItem;
 
-    m_rootItem = item;
+    m_prootItem = item;
     reset();
 }
 
@@ -166,5 +164,5 @@ TreeItem* TreeItemModel::getItem(const QModelIndex &index) const {
         TreeItem *item = static_cast<TreeItem*>(index.internalPointer());
         if (item) return item;
     }
-    return m_rootItem;
+    return m_prootItem;
 }
diff --git a/mixxx/src/library/treeitemmodel.h b/mixxx/src/library/treeitemmodel.h
index 2e18be5eb33b..73fcf82cdce2 100644
--- a/mixxx/src/library/treeitemmodel.h
+++ b/mixxx/src/library/treeitemmodel.h
@@ -24,12 +24,12 @@ class TreeItemModel : public QAbstractItemModel {
     virtual int rowCount(const QModelIndex &parent = QModelIndex()) const;
     virtual int columnCount(const QModelIndex &parent = QModelIndex()) const;
     void setRootItem(TreeItem *item);
-    /** Return the underlying TreeItem.
-     * If the index is invalid, the root item is returned. **/
+    // Return the underlying TreeItem.
+    // If the index is invalid, the root item is returned.
     TreeItem* getItem(const QModelIndex &index) const;
 
   private:
-    TreeItem *m_rootItem;
+    TreeItem *m_prootItem;
 };
 
 #endif
diff --git a/mixxx/src/mixxx.h b/mixxx/src/mixxx.h
index 526dd4f39558..80bf42c38e88 100644
--- a/mixxx/src/mixxx.h
+++ b/mixxx/src/mixxx.h
@@ -99,11 +99,11 @@ class MixxxApp : public QMainWindow {
     void slotHelpManual();
     // Visits translation interface on launchpad.net
     void slotHelpTranslation();
-    /** Scan or rescan the music library directory */
+    // Scan or rescan the music library directory
     void slotScanLibrary();
-    /** Enables the "Rescan Library" menu item. This gets disabled when a scan is running.*/
+    // Enables the "Rescan Library" menu item. This gets disabled when a scan is running.
     void slotEnableRescanLibraryAction();
-    /**Updates the checkboxes for Recording and Livebroadcasting when connection drops, or lame is not available **/
+    //Updates the checkboxes for Recording and Livebroadcasting when connection drops, or lame is not available
     void slotOptionsMenuShow();
     /** toogle on-screen widget visibility */
     void slotViewShowSamplers(bool);
@@ -162,7 +162,7 @@ class MixxxApp : public QMainWindow {
     VinylControlManager *m_pVCManager;
 
     MixxxKeyboard* m_pKeyboard;
-    /** Library scanner object */
+    // Library scanner object
     LibraryScanner* m_pLibraryScanner;
     // The library management object
     Library* m_pLibrary;
diff --git a/mixxx/src/widget/wlibrarysidebar.cpp b/mixxx/src/widget/wlibrarysidebar.cpp
index 5f3ca68f0a62..088539ab5a1b 100644
--- a/mixxx/src/widget/wlibrarysidebar.cpp
+++ b/mixxx/src/widget/wlibrarysidebar.cpp
@@ -22,15 +22,14 @@ WLibrarySidebar::~WLibrarySidebar() {
 }
 
 
-void WLibrarySidebar::contextMenuEvent(QContextMenuEvent *event)
-{
+void WLibrarySidebar::contextMenuEvent(QContextMenuEvent *event) {
     //if (event->state() & Qt::RightButton) { //Dis shiz don werk on windowze
     QModelIndex clickedItem = indexAt(event->pos());
     emit(rightClicked(event->globalPos(), clickedItem));
     //}
 }
 
-/** Drag enter event, happens when a dragged item enters the track sources view*/
+// Drag enter event, happens when a dragged item enters the track sources view
 void WLibrarySidebar::dragEnterEvent(QDragEnterEvent * event)
 {
     qDebug() << "WLibrarySidebar::dragEnterEvent" << event->mimeData()->formats();
@@ -40,8 +39,7 @@ void WLibrarySidebar::dragEnterEvent(QDragEnterEvent * event)
     //QTreeView::dragEnterEvent(event);
 }
 
-/** Drag move event, happens when a dragged item hovers over the track sources view...
- */
+// Drag move event, happens when a dragged item hovers over the track sources view...
 void WLibrarySidebar::dragMoveEvent(QDragMoveEvent * event)
 {
     //qDebug() << "dragMoveEvent" << event->mimeData()->formats();
diff --git a/mixxx/src/widget/wtracktableview.cpp b/mixxx/src/widget/wtracktableview.cpp
index 5fbadf9dbf88..7a1eb6e6c0ac 100644
--- a/mixxx/src/widget/wtracktableview.cpp
+++ b/mixxx/src/widget/wtracktableview.cpp
@@ -354,8 +354,7 @@ void WTrackTableView::loadSelectionToGroup(QString group, bool play) {
 void WTrackTableView::slotRemove()
 {
     QModelIndexList indices = selectionModel()->selectedRows();
-    if (indices.size() > 0)
-    {
+    if (indices.size() > 0) {
         TrackModel* trackModel = getTrackModel();
         if (trackModel) {
             trackModel->removeTracks(indices);
@@ -365,8 +364,7 @@ void WTrackTableView::slotRemove()
 
 void WTrackTableView::slotPurge(){
     QModelIndexList indices = selectionModel()->selectedRows();
-    if (indices.size() > 0)
-    {
+    if (indices.size() > 0) {
         TrackModel* trackModel = getTrackModel();
         if (trackModel) {
             trackModel->purgeTracks(indices);
diff --git a/mixxx/src/widget/wtracktableview.h b/mixxx/src/widget/wtracktableview.h
index 33bfe1582f64..ff84c3f87f93 100644
--- a/mixxx/src/widget/wtracktableview.h
+++ b/mixxx/src/widget/wtracktableview.h
@@ -80,11 +80,11 @@ class WTrackTableView : public WLibraryTableView {
     TrackCollection* m_pTrackCollection;
 
     QSignalMapper m_loadTrackMapper;
+    SearchThread m_searchThread;
 
     DlgTrackInfo* m_pTrackInfo;
     QModelIndex currentTrackInfoIndex;
 
-    SearchThread m_searchThread;
 
     ControlObjectThreadMain* m_pNumSamplers;
     ControlObjectThreadMain* m_pNumDecks;