diff --git a/Source/CollisionDetection/CollisionDetection/imstkBidirectionalPlaneToSphereCD.h b/Source/CollisionDetection/CollisionDetection/imstkBidirectionalPlaneToSphereCD.h
index 33ed10a496e08beefacdf018c7e4f0dd055f58e0..3c081937650d6a0e26c37970575d7112e5c40b11 100644
--- a/Source/CollisionDetection/CollisionDetection/imstkBidirectionalPlaneToSphereCD.h
+++ b/Source/CollisionDetection/CollisionDetection/imstkBidirectionalPlaneToSphereCD.h
@@ -32,7 +32,7 @@ class Geometry;
struct CollisionData;
///
-/// \class PlaneToSphereCD
+/// \class BidirectionalPlaneToSphereCD
///
/// \brief Plane to sphere collision detection
///
diff --git a/Source/CollisionDetection/CollisionDetection/imstkSphereToCylinderCD.h b/Source/CollisionDetection/CollisionDetection/imstkSphereToCylinderCD.h
index 481799ef5999745e719a68a624aeffe96b001204..bf6d4b4fc271b8e1884171944cc88505374c1de2 100644
--- a/Source/CollisionDetection/CollisionDetection/imstkSphereToCylinderCD.h
+++ b/Source/CollisionDetection/CollisionDetection/imstkSphereToCylinderCD.h
@@ -30,7 +30,7 @@ class Cylinder;
struct CollisionData;
///
-/// \class SphereCylinderCD
+/// \class SphereToCylinderCD
///
/// \brief Sphere-Cylinder collision detection
///
diff --git a/Source/CollisionDetection/CollisionDetection/imstkSurfaceMeshToSurfaceMeshCCD.h b/Source/CollisionDetection/CollisionDetection/imstkSurfaceMeshToSurfaceMeshCCD.h
index b9146723f7e502b83c0e739e105a3f32812614c4..a8d0d03f2d51b38c418ad22049e48a1fec15390c 100644
--- a/Source/CollisionDetection/CollisionDetection/imstkSurfaceMeshToSurfaceMeshCCD.h
+++ b/Source/CollisionDetection/CollisionDetection/imstkSurfaceMeshToSurfaceMeshCCD.h
@@ -31,7 +31,7 @@ class SurfaceMesh;
struct CollisionData;
///
-/// \class MeshToMeshCCD
+/// \class SurfaceMeshToSurfaceMeshCCD
///
/// \brief Continuous collision detection for surface meshes
///
diff --git a/Source/CollisionDetection/CollisionDetection/imstkUnidirectionalPlaneToSphereCD.h b/Source/CollisionDetection/CollisionDetection/imstkUnidirectionalPlaneToSphereCD.h
index a453befe5f9355e553526aeda950623dbe7e2a80..23342d3ca05b71ed6283cbfe5fb7010f25e25c9f 100644
--- a/Source/CollisionDetection/CollisionDetection/imstkUnidirectionalPlaneToSphereCD.h
+++ b/Source/CollisionDetection/CollisionDetection/imstkUnidirectionalPlaneToSphereCD.h
@@ -30,7 +30,7 @@ class Sphere;
struct CollisionData;
///
-/// \class PlaneToSphereCD
+/// \class UnidirectionalPlaneToSphereCD
///
/// \brief Plane to sphere collision detection
///
diff --git a/Source/Controllers/imstkLaparoscopicToolController.h b/Source/Controllers/imstkLaparoscopicToolController.h
index 064c4b8e515ff0248501754e275408b9232aaa5a..ad05a19728e25e2266a957b88e1700dead8af344 100644
--- a/Source/Controllers/imstkLaparoscopicToolController.h
+++ b/Source/Controllers/imstkLaparoscopicToolController.h
@@ -29,7 +29,7 @@ namespace imstk
class SceneObject;
///
-/// \class LaparoscopicTool
+/// \class LaparoscopicToolController
///
/// \brief Two-jawed laparoscopic tool controlled by external device
/// The tool is composed of three scene objects: pivot, lower jaw and upper jaw
diff --git a/Source/Devices/imstkDummyClient.h b/Source/Devices/imstkDummyClient.h
index 967196417979f8ed00b6ebab96b74cdcc0cc9fa8..a21fcdeae125d2971f2552011880d24a80f75268 100644
--- a/Source/Devices/imstkDummyClient.h
+++ b/Source/Devices/imstkDummyClient.h
@@ -26,7 +26,7 @@
namespace imstk
{
///
-/// \class Dummy client
+/// \class DummyClient
/// \brief Allows setting the pose of the device from external caller without a
/// real device connected
///
diff --git a/Source/DynamicalModels/ObjectModels/PbdConstraints/imstkPbdAreaConstraint.h b/Source/DynamicalModels/ObjectModels/PbdConstraints/imstkPbdAreaConstraint.h
index 03cd7b923b4a2e62eb4803fc820ed2132790f87e..02d5099dbc31eea0da2ac13e1c06d9d4a47c67bb 100644
--- a/Source/DynamicalModels/ObjectModels/PbdConstraints/imstkPbdAreaConstraint.h
+++ b/Source/DynamicalModels/ObjectModels/PbdConstraints/imstkPbdAreaConstraint.h
@@ -26,7 +26,7 @@
namespace imstk
{
////
-/// \class AreaConstraint
+/// \class PbdAreaConstraint
///
/// \brief Area constraint for triangular face
///
diff --git a/Source/DynamicalModels/ObjectModels/PbdConstraints/imstkPbdConstraint.h b/Source/DynamicalModels/ObjectModels/PbdConstraints/imstkPbdConstraint.h
index d2ab09f2eb8131d6d6c04ea2bd0af5995d063277..37e96681c01879a3be04de0c4ab322c798622772 100644
--- a/Source/DynamicalModels/ObjectModels/PbdConstraints/imstkPbdConstraint.h
+++ b/Source/DynamicalModels/ObjectModels/PbdConstraints/imstkPbdConstraint.h
@@ -28,6 +28,8 @@ namespace imstk
class PbdModel;
///
+/// \class PbdConstraint
+///
/// \brief Base Constraint class for Position based dynamics constraints
///
class PbdConstraint
diff --git a/Source/DynamicalModels/ObjectModels/PbdConstraints/imstkPbdEdgeEdgeCollisionConstraint.h b/Source/DynamicalModels/ObjectModels/PbdConstraints/imstkPbdEdgeEdgeCollisionConstraint.h
index 2f27b3e317a456d28c1e4606be852ad73d8ff90f..967c31df18cf163c2094b77c338aaa41c2bf1c03 100644
--- a/Source/DynamicalModels/ObjectModels/PbdConstraints/imstkPbdEdgeEdgeCollisionConstraint.h
+++ b/Source/DynamicalModels/ObjectModels/PbdConstraints/imstkPbdEdgeEdgeCollisionConstraint.h
@@ -26,6 +26,8 @@
namespace imstk
{
///
+/// \class PbdEdgeEdgeConstraint
+///
/// \brief The PbdEdgeEdgeConstraint class for edge-edge collision response
///
class PbdEdgeEdgeConstraint : public PbdCollisionConstraint
diff --git a/Source/DynamicalModels/ObjectModels/PbdConstraints/imstkPbdFEHexConstraint.h b/Source/DynamicalModels/ObjectModels/PbdConstraints/imstkPbdFEHexConstraint.h
index 3867ca9a9dadd703b5e35e70c53b5bfb79fdef44..6d772d6675c75b8a65522063b3c7519fd59fda1a 100644
--- a/Source/DynamicalModels/ObjectModels/PbdConstraints/imstkPbdFEHexConstraint.h
+++ b/Source/DynamicalModels/ObjectModels/PbdConstraints/imstkPbdFEHexConstraint.h
@@ -26,7 +26,7 @@
namespace imstk
{
///
-/// \class FEMHexConstraint
+/// \class PbdFEMHexConstraint
///
/// \brief The FEMHexConstraint class class for constraint as the elastic energy
/// computed by linear shape functions with hexahedral mesh.
diff --git a/Source/DynamicalModels/ObjectModels/PbdConstraints/imstkPbdFETetConstraint.h b/Source/DynamicalModels/ObjectModels/PbdConstraints/imstkPbdFETetConstraint.h
index 23c038982cec4a3b23aaa68e0fb1597d9bea08f5..1c1b41eca3fc43d073640f9d7609974bc5980e4f 100644
--- a/Source/DynamicalModels/ObjectModels/PbdConstraints/imstkPbdFETetConstraint.h
+++ b/Source/DynamicalModels/ObjectModels/PbdConstraints/imstkPbdFETetConstraint.h
@@ -26,7 +26,7 @@
namespace imstk
{
///
-/// \class FEMTetConstraint
+/// \class PbdFEMTetConstraint
///
/// \brief The FEMTetConstraint class class for constraint as the elastic energy
/// computed by linear shape functions with tetrahedral mesh.
diff --git a/Source/DynamicalModels/ObjectModels/PbdConstraints/imstkPbdPointTriCollisionConstraint.h b/Source/DynamicalModels/ObjectModels/PbdConstraints/imstkPbdPointTriCollisionConstraint.h
index 6861542386833e79b9c4c8a07844008aed3e4380..ba1335e4927542b9acbdc3c111f34e876932e49a 100644
--- a/Source/DynamicalModels/ObjectModels/PbdConstraints/imstkPbdPointTriCollisionConstraint.h
+++ b/Source/DynamicalModels/ObjectModels/PbdConstraints/imstkPbdPointTriCollisionConstraint.h
@@ -26,6 +26,8 @@
namespace imstk
{
///
+/// \class PbdPointTriangleConstraint
+///
/// \brief The PbdPointTriangleConstraint class for point-triangle collision response
///
class PbdPointTriangleConstraint : public PbdCollisionConstraint
diff --git a/Source/DynamicalModels/ObjectModels/PbdConstraints/imstkPbdVolumeConstraint.h b/Source/DynamicalModels/ObjectModels/PbdConstraints/imstkPbdVolumeConstraint.h
index 74683b391b89aa8d883a94b2892f78c37267fbc1..0fb646cb953facf8c3fac8ad09a5235ee0b60164 100644
--- a/Source/DynamicalModels/ObjectModels/PbdConstraints/imstkPbdVolumeConstraint.h
+++ b/Source/DynamicalModels/ObjectModels/PbdConstraints/imstkPbdVolumeConstraint.h
@@ -26,7 +26,7 @@
namespace imstk
{
///
-/// \class VolumeConstraint
+/// \class PbdVolumeConstraint
///
/// \brief Volume constraint for tetrahedral element
///
diff --git a/Source/DynamicalModels/ObjectModels/imstkPbdModel.h b/Source/DynamicalModels/ObjectModels/imstkPbdModel.h
index a2c908755fd43012f1337ce2c4b1ff79d9210a0a..6d882c25601e33e8e4191a6cd5183f997a66a73e 100644
--- a/Source/DynamicalModels/ObjectModels/imstkPbdModel.h
+++ b/Source/DynamicalModels/ObjectModels/imstkPbdModel.h
@@ -35,7 +35,7 @@ namespace imstk
class PointSet;
///
-/// \class PBDModelConfig
+/// \struct PBDModelConfig
/// \brief Parameters for PBD simulation
///
struct PBDModelConfig
diff --git a/Source/DynamicalModels/ObjectStates/imstkVectorizedState.h b/Source/DynamicalModels/ObjectStates/imstkVectorizedState.h
index 524760a9e15189ce78ab89abc4b3fdf20f6409c0..395fd61337a10db717545a3d2fcc75b336a1e1a0 100644
--- a/Source/DynamicalModels/ObjectStates/imstkVectorizedState.h
+++ b/Source/DynamicalModels/ObjectStates/imstkVectorizedState.h
@@ -26,7 +26,7 @@
namespace imstk
{
///
-/// \class DeformableBodyState
+/// \class FeDeformBodyState
///
/// \brief This class stores the state of the unknown field variable in vectorized form
///
diff --git a/Source/DynamicalModels/TimeIntegrators/imstkBackwardEuler.h b/Source/DynamicalModels/TimeIntegrators/imstkBackwardEuler.h
index 29f1c4e57e490eef395dd5e6e33fb53e12668a8a..c1acebccdcca0de8ed5c41cdafa84e7644ae7f3f 100644
--- a/Source/DynamicalModels/TimeIntegrators/imstkBackwardEuler.h
+++ b/Source/DynamicalModels/TimeIntegrators/imstkBackwardEuler.h
@@ -26,7 +26,8 @@
namespace imstk
{
///
-/// \class Backward Euler time integration
+/// \class BackwardEuler
+/// \brief Backward Euler time integration
///
class BackwardEuler : public TimeIntegrator
{
diff --git a/Source/DynamicalModels/TimeIntegrators/imstkNewmarkBeta.h b/Source/DynamicalModels/TimeIntegrators/imstkNewmarkBeta.h
index 15e97069ba3d4f26423bd746eb195148d6bea4f1..596d01ef4bfcf8374633f79e77219e63ddb1f036 100644
--- a/Source/DynamicalModels/TimeIntegrators/imstkNewmarkBeta.h
+++ b/Source/DynamicalModels/TimeIntegrators/imstkNewmarkBeta.h
@@ -27,7 +27,8 @@
namespace imstk
{
///
-/// \class Newmark-beta time integration
+/// \class NewmarkBeta
+/// \brief Newmark-beta time integration
///
class NewmarkBeta : public TimeIntegrator
{
diff --git a/Source/Geometry/imstkDebugRenderGeometry.h b/Source/Geometry/imstkDebugRenderGeometry.h
index 86fbef44a286f650b262ac789c3d83e1b69eb1bf..2fcdfb3b8a74cc8f1142b01a098a0b0c758864c4 100644
--- a/Source/Geometry/imstkDebugRenderGeometry.h
+++ b/Source/Geometry/imstkDebugRenderGeometry.h
@@ -26,7 +26,7 @@
namespace imstk
{
///
-/// \class imstkDbgRenderGeometry
+/// \class DebugRenderGeometry
///
/// \brief Debug render geometry base class
/// During rendering, firstly call to clear() to clear the vertex buffer then iteratively call to appendVertex()
diff --git a/Source/Rendering/VTKRenderer/RenderDelegate/imstkVTKCapsuleRenderDelegate.h b/Source/Rendering/VTKRenderer/RenderDelegate/imstkVTKCapsuleRenderDelegate.h
index 009c6448bf7e930c55737a4b6f0236687afa024f..16f192958f7e1717195bd4bc8ffd822b08d58a45 100644
--- a/Source/Rendering/VTKRenderer/RenderDelegate/imstkVTKCapsuleRenderDelegate.h
+++ b/Source/Rendering/VTKRenderer/RenderDelegate/imstkVTKCapsuleRenderDelegate.h
@@ -28,9 +28,9 @@ class vtkTransformPolyDataFilter;
namespace imstk
{
///
-/// \class CapsuleRenderDelegate
+/// \class VTKCapsuleRenderDelegate
///
-/// \brief Render capsule using vtk api
+/// \brief Render capsule object with vtk backend
///
class VTKCapsuleRenderDelegate : public VTKRenderDelegate
{
diff --git a/Source/Rendering/VTKRenderer/RenderDelegate/imstkVTKCubeRenderDelegate.h b/Source/Rendering/VTKRenderer/RenderDelegate/imstkVTKCubeRenderDelegate.h
index d298ed443e303c9cee859bf1b7728c929f4542fb..9b43993fe10699ee78b5755eef14760bb4d9593a 100644
--- a/Source/Rendering/VTKRenderer/RenderDelegate/imstkVTKCubeRenderDelegate.h
+++ b/Source/Rendering/VTKRenderer/RenderDelegate/imstkVTKCubeRenderDelegate.h
@@ -28,9 +28,9 @@ class vtkTransformPolyDataFilter;
namespace imstk
{
///
-/// \class CubeRenderDelegate
+/// \class VTKCubeRenderDelegate
///
-/// \brief Cube render delegate
+/// \brief Cube render delegate with VTK backend
///
class VTKCubeRenderDelegate : public VTKRenderDelegate
{
diff --git a/Source/Rendering/VTKRenderer/RenderDelegate/imstkVTKCylinderRenderDelegate.h b/Source/Rendering/VTKRenderer/RenderDelegate/imstkVTKCylinderRenderDelegate.h
index c5d582ffc960a1209a5489cd5116b5d67e7844f6..97cb70ca671ab412f8a0afc211f723eb91052547 100644
--- a/Source/Rendering/VTKRenderer/RenderDelegate/imstkVTKCylinderRenderDelegate.h
+++ b/Source/Rendering/VTKRenderer/RenderDelegate/imstkVTKCylinderRenderDelegate.h
@@ -29,9 +29,9 @@ class vtkCylinderSource;
namespace imstk
{
///
-/// \class CylinderRenderDelegate
+/// \class VTKCylinderRenderDelegate
///
-/// \brief Cylinder render delegate
+/// \brief Cylinder object render delegate with VTK backend
///
class VTKCylinderRenderDelegate : public VTKRenderDelegate
{
diff --git a/Source/Rendering/VTKRenderer/RenderDelegate/imstkVTKHexahedralMeshRenderDelegate.h b/Source/Rendering/VTKRenderer/RenderDelegate/imstkVTKHexahedralMeshRenderDelegate.h
index 03ca039dced22adbefd822f283c7e7b37f460832..3ef1e9eeb673d84fd47903c93976bd83334bb2ba 100644
--- a/Source/Rendering/VTKRenderer/RenderDelegate/imstkVTKHexahedralMeshRenderDelegate.h
+++ b/Source/Rendering/VTKRenderer/RenderDelegate/imstkVTKHexahedralMeshRenderDelegate.h
@@ -30,9 +30,9 @@ namespace imstk
class HexahedralMesh;
///
-/// \class HexahedralMeshRenderDelegate
+/// \class VTKHexahedralMeshRenderDelegate
///
-/// \brief
+/// \brief Hexahedral mesh render delegate with VTK backend
///
class VTKHexahedralMeshRenderDelegate : public VTKRenderDelegate
{
diff --git a/Source/Rendering/VTKRenderer/RenderDelegate/imstkVTKImageDataRenderDelegate.h b/Source/Rendering/VTKRenderer/RenderDelegate/imstkVTKImageDataRenderDelegate.h
index f13957ce7366033dfc001dd81c97c75ea6e85860..710f7c525acf5f358c535be1fae23382f1c7c9aa 100644
--- a/Source/Rendering/VTKRenderer/RenderDelegate/imstkVTKImageDataRenderDelegate.h
+++ b/Source/Rendering/VTKRenderer/RenderDelegate/imstkVTKImageDataRenderDelegate.h
@@ -28,7 +28,7 @@ namespace imstk
class ImageData;
///
-/// \class ImageDataRenderDelegate
+/// \class VTKImageDataRenderDelegate
///
/// \brief Render delegate to do to volume rendering using VTK
///
diff --git a/Source/Rendering/VTKRenderer/RenderDelegate/imstkVTKLineMeshRenderDelegate.h b/Source/Rendering/VTKRenderer/RenderDelegate/imstkVTKLineMeshRenderDelegate.h
index 6a40a0b4244344451eea3532c5ae65b3c3c2a3ce..6edc6691e5291cef3cbdc662ace87526bc56bf72 100644
--- a/Source/Rendering/VTKRenderer/RenderDelegate/imstkVTKLineMeshRenderDelegate.h
+++ b/Source/Rendering/VTKRenderer/RenderDelegate/imstkVTKLineMeshRenderDelegate.h
@@ -30,7 +30,7 @@ namespace imstk
class LineMesh;
///
-/// \class LineMeshRenderDelegate
+/// \class VTKLineMeshRenderDelegate
///
/// \brief
///
diff --git a/Source/Rendering/VTKRenderer/RenderDelegate/imstkVTKPlaneRenderDelegate.h b/Source/Rendering/VTKRenderer/RenderDelegate/imstkVTKPlaneRenderDelegate.h
index 230bbb4b819e552ef96e7aaa78adcae36408abba..2a7c252c1daad17eb7008047aa7694a28bb4bea8 100644
--- a/Source/Rendering/VTKRenderer/RenderDelegate/imstkVTKPlaneRenderDelegate.h
+++ b/Source/Rendering/VTKRenderer/RenderDelegate/imstkVTKPlaneRenderDelegate.h
@@ -30,9 +30,9 @@ namespace imstk
class Plane;
///
-/// \class PlaneRenderDelegate
+/// \class VTKPlaneRenderDelegate
///
-/// \brief
+/// \brief Plane object render delegate
///
class VTKPlaneRenderDelegate : public VTKRenderDelegate
{
diff --git a/Source/Rendering/VTKRenderer/RenderDelegate/imstkVTKPointSetRenderDelegate.h b/Source/Rendering/VTKRenderer/RenderDelegate/imstkVTKPointSetRenderDelegate.h
index fb69387eb09561b4538a75707ed4e0720590a03d..d2260173e21193a3b54c640bf0e85f4162f02dfc 100644
--- a/Source/Rendering/VTKRenderer/RenderDelegate/imstkVTKPointSetRenderDelegate.h
+++ b/Source/Rendering/VTKRenderer/RenderDelegate/imstkVTKPointSetRenderDelegate.h
@@ -30,7 +30,7 @@ namespace imstk
class PointSet;
///
-/// \class PointSetRenderDelegate
+/// \class VTKPointSetRenderDelegate
///
/// \brief Render delegate for point set. A 3D glyph of spheres is
/// created to render each node
diff --git a/Source/Rendering/VTKRenderer/RenderDelegate/imstkVTKRenderDelegate.h b/Source/Rendering/VTKRenderer/RenderDelegate/imstkVTKRenderDelegate.h
index 3dbf7fd3fa984be3b3662461a9e8d0b32a9f7994..8921311313425da60e854e9d25aaf8a02591f85f 100644
--- a/Source/Rendering/VTKRenderer/RenderDelegate/imstkVTKRenderDelegate.h
+++ b/Source/Rendering/VTKRenderer/RenderDelegate/imstkVTKRenderDelegate.h
@@ -40,9 +40,9 @@
namespace imstk
{
///
-/// \class RenderDelegate
+/// \class VTKRenderDelegate
///
-/// \brief Base class for render delegates
+/// \brief Base class for VTK render delegates
///
class VTKRenderDelegate
{
@@ -63,8 +63,7 @@ public:
/// \param source input data object
/// \param vizModel imstk visual model
///
- void setUpMapper(vtkAlgorithmOutput* source,
- const std::shared_ptr<VisualModel> vizModel);
+ void setUpMapper(vtkAlgorithmOutput* source, const std::shared_ptr<VisualModel> vizModel);
///
/// \brief Return geometry to render
@@ -128,6 +127,7 @@ protected:
vtkSmartPointer<vtkGPUVolumeRayCastMapper> m_volumeMapper;
vtkSmartPointer<vtkVolume> m_volume;
bool m_modelIsVolume=false;// remove?
+
bool m_isMesh = true;
// VTK data members used to create the rendering pipeline
diff --git a/Source/Rendering/VTKRenderer/RenderDelegate/imstkVTKSphereRenderDelegate.h b/Source/Rendering/VTKRenderer/RenderDelegate/imstkVTKSphereRenderDelegate.h
index 01c54a121307cbb934e0e668969d0395b987e97e..59b8af5b5f5b574815eb7bfef6584022de264f37 100644
--- a/Source/Rendering/VTKRenderer/RenderDelegate/imstkVTKSphereRenderDelegate.h
+++ b/Source/Rendering/VTKRenderer/RenderDelegate/imstkVTKSphereRenderDelegate.h
@@ -29,9 +29,9 @@ namespace imstk
{
class VisualModel;
///
-/// \class SphereRenderDelegate
+/// \class VTKSphereRenderDelegate
///
-/// \brief
+/// \brief Sphere object render delegate with VTK backend
///
class VTKSphereRenderDelegate : public VTKRenderDelegate
{
diff --git a/Source/Rendering/VTKRenderer/RenderDelegate/imstkVTKSurfaceMeshRenderDelegate.h b/Source/Rendering/VTKRenderer/RenderDelegate/imstkVTKSurfaceMeshRenderDelegate.h
index 3eb459c6a4a94151e8e7b023ddd3f4654bf19006..346146b7939d961978cd42b7a7e51de5515143c2 100644
--- a/Source/Rendering/VTKRenderer/RenderDelegate/imstkVTKSurfaceMeshRenderDelegate.h
+++ b/Source/Rendering/VTKRenderer/RenderDelegate/imstkVTKSurfaceMeshRenderDelegate.h
@@ -30,9 +30,9 @@ namespace imstk
class SurfaceMesh;
///
-/// \class SurfaceMeshRenderDelegate
+/// \class VTKSurfaceMeshRenderDelegate
///
-/// \brief
+/// \brief Surface mesh render delegate with VTK backend
///
class VTKSurfaceMeshRenderDelegate : public VTKRenderDelegate
{
diff --git a/Source/Rendering/VTKRenderer/RenderDelegate/imstkVTKTetrahedralMeshRenderDelegate.h b/Source/Rendering/VTKRenderer/RenderDelegate/imstkVTKTetrahedralMeshRenderDelegate.h
index a11969e8715c4284ef91e920213d19f4cf745d3d..a19fda48873e1db5a4c817b5b85b1a8cc5f9cb46 100644
--- a/Source/Rendering/VTKRenderer/RenderDelegate/imstkVTKTetrahedralMeshRenderDelegate.h
+++ b/Source/Rendering/VTKRenderer/RenderDelegate/imstkVTKTetrahedralMeshRenderDelegate.h
@@ -31,9 +31,9 @@ namespace imstk
class TetrahedralMesh;
///
-/// \class TetrahedralMeshRenderDelegate
+/// \class VTKTetrahedralMeshRenderDelegate
///
-/// \brief
+/// \brief Tetrahedral mesh render delegate with vtk render backend
///
class VTKTetrahedralMeshRenderDelegate : public VTKRenderDelegate
{
diff --git a/Source/Rendering/VTKRenderer/RenderDelegate/imstkVTKdebugLinesRenderDelegate.h b/Source/Rendering/VTKRenderer/RenderDelegate/imstkVTKdebugLinesRenderDelegate.h
index c4ebeadbd6248576964deff04836508341c8381c..a1657018fda131871b19d9c62158297055326a02 100644
--- a/Source/Rendering/VTKRenderer/RenderDelegate/imstkVTKdebugLinesRenderDelegate.h
+++ b/Source/Rendering/VTKRenderer/RenderDelegate/imstkVTKdebugLinesRenderDelegate.h
@@ -31,9 +31,10 @@ class vtkCellArray;
namespace imstk
{
///
-/// \class LinesRenderDelegate
+/// \class VTKdbgLinesRenderDelegate
///
-/// \brief Renders a list of disjoint line segments
+/// \brief Render delegate for a set of disjoint lines whose size could change
+/// more frequently which is typically he case for rendering arbitrary set of lines
///
class VTKdbgLinesRenderDelegate : public VTKRenderDelegate
{
diff --git a/Source/Rendering/VTKRenderer/RenderDelegate/imstkVTKdebugPointsRenderDelegate.h b/Source/Rendering/VTKRenderer/RenderDelegate/imstkVTKdebugPointsRenderDelegate.h
index 7be631ba8b7f764c69243d8f59e26b4fd95e6748..66d2ab131de269efd89f964761470803409dcbd2 100644
--- a/Source/Rendering/VTKRenderer/RenderDelegate/imstkVTKdebugPointsRenderDelegate.h
+++ b/Source/Rendering/VTKRenderer/RenderDelegate/imstkVTKdebugPointsRenderDelegate.h
@@ -31,9 +31,10 @@ class vtkGlyph3D;
namespace imstk
{
///
-/// \class LinesRenderDelegate
+/// \class VTKdbgPointsRenderDelegate
///
-/// \brief Renders a list of points
+/// \brief Render delegate for a set of disjoint points whose size could change
+/// more frequently which is typically he case for rendering arbitrary set of points
///
class VTKdbgPointsRenderDelegate : public VTKRenderDelegate
{
diff --git a/Source/Rendering/VTKRenderer/RenderDelegate/imstkVTKdebugTrianglesRenderDelegate.h b/Source/Rendering/VTKRenderer/RenderDelegate/imstkVTKdebugTrianglesRenderDelegate.h
index 5b80a94d4ab0aa4f56fdabfc64851f44f35c0a1d..69539c58a6213227fcd92fffdc183c20470ca6f7 100644
--- a/Source/Rendering/VTKRenderer/RenderDelegate/imstkVTKdebugTrianglesRenderDelegate.h
+++ b/Source/Rendering/VTKRenderer/RenderDelegate/imstkVTKdebugTrianglesRenderDelegate.h
@@ -31,9 +31,10 @@ namespace imstk
class SurfaceMesh;
///
-/// \class SurfaceMeshRenderDelegate
+/// \class VTKdbgTrianglesRenderDelegate
///
-/// \brief
+/// \brief Render delegate for a set of disjoint triangles whose size could change
+/// more frequently which is typically he case for rendering arbitrary set of triangles
///
class VTKdbgTrianglesRenderDelegate : public VTKRenderDelegate
{
diff --git a/Source/SimulationManager/VTKRenderer/imstkVTKInteractorStyle.h b/Source/SimulationManager/VTKRenderer/imstkVTKInteractorStyle.h
index 3632b5e84da096d30e047d92a27e0728668e90f2..fde971efd920b0830b90426bfcc1c7023d5d2ca7 100644
--- a/Source/SimulationManager/VTKRenderer/imstkVTKInteractorStyle.h
+++ b/Source/SimulationManager/VTKRenderer/imstkVTKInteractorStyle.h
@@ -36,7 +36,7 @@ class VTKTextStatusManager;
using vtkBaseInteractorStyle = vtkInteractorStyleTrackballCamera;
///
-/// \class classname
+/// \class VTKInteractorStyle
///
/// \brief
///
diff --git a/Source/SimulationManager/VTKRenderer/imstkVTKViewer.h b/Source/SimulationManager/VTKRenderer/imstkVTKViewer.h
index 5f9c54531c9086394c52a4abd3883209325cb558..9ea6a5650cdb293ee61f84e1ff003b091204e291 100644
--- a/Source/SimulationManager/VTKRenderer/imstkVTKViewer.h
+++ b/Source/SimulationManager/VTKRenderer/imstkVTKViewer.h
@@ -45,6 +45,8 @@ class Scene;
/// \class VTKViewer
///
/// \brief Subclasses viewer for the VTK rendering back-end
+/// Creates vtk renderer for each scene. Forwards mouse and keyboard events
+/// to the vtk renderwindow
///
class VTKViewer : public Viewer
{
@@ -110,7 +112,6 @@ protected:
vtkSmartPointer<vtkRenderWindow> m_vtkRenderWindow;
std::shared_ptr<VTKInteractorStyle> m_vtkInteractorStyle;
bool m_enableVR;
- std::string m_windowName = "imstk";
#ifdef iMSTK_ENABLE_VR
vtkSmartPointer<OpenVRCommand> m_openVRCommand;