diff --git a/src/core/lvmdevice.cpp b/src/core/lvmdevice.cpp
index 80628f9..0797cd4 100644
--- a/src/core/lvmdevice.cpp
+++ b/src/core/lvmdevice.cpp
@@ -16,15 +16,16 @@
  *************************************************************************/
 
 #include "core/lvmdevice.h"
+#include "core/partition.h"
 #include "fs/filesystem.h"
 #include "fs/lvm2_pv.h"
 #include "fs/luks.h"
 #include "fs/filesystemfactory.h"
-#include "core/partition.h"
 
 #include "core/partitiontable.h"
 #include "util/externalcommand.h"
 #include "util/helpers.h"
+#include "util/report.h"
 
 #include <QRegularExpression>
 
diff --git a/src/core/lvmdevice.h b/src/core/lvmdevice.h
index 9788393..70a4238 100644
--- a/src/core/lvmdevice.h
+++ b/src/core/lvmdevice.h
@@ -20,9 +20,7 @@
 #define LVMDEVICE__H
 
 #include "core/volumemanagerdevice.h"
-
 #include "util/libpartitionmanagerexport.h"
-#include "util/report.h"
 
 #include <QString>
 #include <QObject>
@@ -30,7 +28,8 @@
 #include <QStringList>
 
 class PartitionTable;
-class CreatePartitionTableOperation;
+class Report;
+class Partition;
 class SmartStatus;
 
 /** Represents LVM Volume Group.
@@ -56,6 +55,10 @@ public:
     static QStringList s_DirtyPVs;
 
 public:
+
+    /**
+     *
+     */
     static QList<LvmDevice*> scanSystemLVM();
 
     static const QStringList getVGs();
@@ -88,10 +91,18 @@ public:
     static bool activateVG(Report& report, const LvmDevice& dev);
 
 protected:
-    void initPartitions() override;
-    const QList<Partition*> scanPartitions(PartitionTable* pTable) const;
-    Partition* scanPartition(const QString& lvPath, PartitionTable* pTable) const;
 
+    void initPartitions() override;
+
+    /**
+     *
+     */
+    const QList<Partition*> scanPartitions(PartitionTable* pTable) const;
+
+    /**
+     *
+     */
+    Partition* scanPartition(const QString& lvPath, PartitionTable* pTable) const;
     qint64 mappedSector(const QString& lvpath, qint64 sector) const override;
 
 public:
diff --git a/src/core/volumemanagerdevice.cpp b/src/core/volumemanagerdevice.cpp
index afe1410..66172bc 100644
--- a/src/core/volumemanagerdevice.cpp
+++ b/src/core/volumemanagerdevice.cpp
@@ -17,11 +17,6 @@
 
 #include "core/volumemanagerdevice.h"
 
-#include "core/partitiontable.h"
-#include "core/smartstatus.h"
-
-#include "util/capacity.h"
-
 /** Constructs a Volume Manager Device with an empty PartitionTable.
 */
 VolumeManagerDevice::VolumeManagerDevice(const QString& name,
diff --git a/src/core/volumemanagerdevice.h b/src/core/volumemanagerdevice.h
index 9c2ce8c..62ad04e 100644
--- a/src/core/volumemanagerdevice.h
+++ b/src/core/volumemanagerdevice.h
@@ -27,12 +27,6 @@
 #include <QObject>
 #include <QtGlobal>
 
-class PartitionTable;
-class CreatePartitionTableOperation;
-class CoreBackend;
-class SmartStatus;
-class Partition;
-
 /** A Volume Manager of real physical devices represented as an abstract device.
 
     VolumeManagerDevice is an abstract class of volume manager. e.g: LVM, SoftRAID.
@@ -47,23 +41,34 @@ class LIBKPMCORE_EXPORT VolumeManagerDevice : public Device
     Q_DISABLE_COPY(VolumeManagerDevice)
 
 public:
+
     /**
      *
      */
     VolumeManagerDevice(const QString& name, const QString& devicenode, const qint32 logicalSize, const qint64 totalLogical, const QString& iconname = QString(), Device::Type type = Device::Unknown_Device);
 
+    /**
+     *  @return list of physical device or partitions that makes up volumeManagerDevice.
+     */
+    virtual const QStringList deviceNodes() const = 0;
+
     /**
      *
      */
-    virtual const QStringList deviceNodes() const = 0; /** Return list of physical device or partitions that makes up volumeManagerDevice. */
     virtual const QStringList partitionNodes() const = 0; /** Return list of partitions on the device. */
+
+    /**
+     *
+     */
     virtual qint64 partitionSize(QString& partitionPath) const = 0; /** Return size of provided partition in bytes. */
 
 protected:
+
     /**
      *
      */
     virtual void initPartitions() = 0;
+
     /**
      *
      */
@@ -73,17 +78,18 @@ public:
 
     /** string deviceNodes together into comma-sperated list
      *
-     * */
+     *  @return comma-seperated list of deviceNodes
+     */
     virtual QString prettyDeviceNodeList() const;
 
-    /**
+    /** Resize device total number of logical sectors.
      *
+     * @param n Number of sectors.
      */
-    void setTotalLogical(qint64 num) {
-        Q_ASSERT(num > 0);
-        m_TotalLogical = num;
+    void setTotalLogical(qint64 n) {
+        Q_ASSERT(n > 0);
+        m_TotalLogical = n;
     }
 };
 
 #endif
-