diff --git a/Examples/BoneShaving/BoneShavingExample.cpp b/Examples/BoneShaving/BoneShavingExample.cpp
index c17e5050fe3f8857bdbd1e7910f316c8b4e85c43..47d52f8cbf2b278c89588411b68af3312320e244 100644
--- a/Examples/BoneShaving/BoneShavingExample.cpp
+++ b/Examples/BoneShaving/BoneShavingExample.cpp
@@ -64,8 +64,8 @@ main()
 
     // Device Server
     imstkNew<HapticDeviceManager>       server;
-    const std::string deviceName = "";
-    std::shared_ptr<HapticDeviceClient> client = server->makeDeviceClient(deviceName);
+    const std::string                   deviceName = "";
+    std::shared_ptr<HapticDeviceClient> client     = server->makeDeviceClient(deviceName);
 
     // Create bone scene object
     // Load the mesh
diff --git a/Examples/CameraController/CameraControllerExample.cpp b/Examples/CameraController/CameraControllerExample.cpp
index d8ca513925e68680dbdb1fb088db621cdbad6c60..51d0b54b784ee238249611199375764e59e41eed 100644
--- a/Examples/CameraController/CameraControllerExample.cpp
+++ b/Examples/CameraController/CameraControllerExample.cpp
@@ -53,8 +53,8 @@ main()
 
     // Device Server
     imstkNew<HapticDeviceManager>       server;
-    const std::string deviceName = "";
-    std::shared_ptr<HapticDeviceClient> client = server->makeDeviceClient(deviceName);
+    const std::string                   deviceName = "";
+    std::shared_ptr<HapticDeviceClient> client     = server->makeDeviceClient(deviceName);
 
     // Load Mesh
     auto                   mesh = MeshIO::read<SurfaceMesh>(iMSTK_DATA_ROOT "/asianDragon/asianDragon.obj");
diff --git a/Examples/ObjectController/ObjectControllerExample.cpp b/Examples/ObjectController/ObjectControllerExample.cpp
index 188dc66bfb4f34870eba15f533f633c983f73e16..06369e45c0129da31b7c90ad6f230d66ed5ee0ec 100644
--- a/Examples/ObjectController/ObjectControllerExample.cpp
+++ b/Examples/ObjectController/ObjectControllerExample.cpp
@@ -51,8 +51,8 @@ main()
 
     // Device Server
     imstkNew<HapticDeviceManager>       server;
-    const std::string deviceName = "";
-    std::shared_ptr<HapticDeviceClient> client = server->makeDeviceClient(deviceName);
+    const std::string                   deviceName = "";
+    std::shared_ptr<HapticDeviceClient> client     = server->makeDeviceClient(deviceName);
 
     // Object
     imstkNew<Cube>            geom(Vec3d(0.0, 1.0, 0.0), 2.0);
diff --git a/Examples/RigidBodyVirtualCoupling/RigidBodyVirtualCouplingExample.cpp b/Examples/RigidBodyVirtualCoupling/RigidBodyVirtualCouplingExample.cpp
index 28b1d41c894d2313508d819c1f53e0dcb87ab812..994258118bb5d378f8ebb69c93220bebb9339e88 100644
--- a/Examples/RigidBodyVirtualCoupling/RigidBodyVirtualCouplingExample.cpp
+++ b/Examples/RigidBodyVirtualCoupling/RigidBodyVirtualCouplingExample.cpp
@@ -198,8 +198,8 @@ main()
 
     // Device Server
     imstkNew<HapticDeviceManager>       server;
-    const std::string deviceName = "";
-    std::shared_ptr<HapticDeviceClient> client = server->makeDeviceClient(deviceName);
+    const std::string                   deviceName = "";
+    std::shared_ptr<HapticDeviceClient> client     = server->makeDeviceClient(deviceName);
 
     // Create a virtual coupling object
     imstkNew<Sphere>         visualGeom(Vec3d(0.0, 0.0, 0.0), 5.0);
diff --git a/Examples/VirtualCoupling/VirtualCouplingExample.cpp b/Examples/VirtualCoupling/VirtualCouplingExample.cpp
index 179dc73ca9cb035d05e772249f21ecef5063a0af..e7122bb91cb17e92df3765d7f762250247b0ba9a 100644
--- a/Examples/VirtualCoupling/VirtualCouplingExample.cpp
+++ b/Examples/VirtualCoupling/VirtualCouplingExample.cpp
@@ -69,8 +69,8 @@ main()
 
     // Device Server
     imstkNew<HapticDeviceManager>       server;
-    const std::string deviceName = "";
-    std::shared_ptr<HapticDeviceClient> client = server->makeDeviceClient(deviceName);
+    const std::string                   deviceName = "";
+    std::shared_ptr<HapticDeviceClient> client     = server->makeDeviceClient(deviceName);
 
     // Create a virtual coupling object
     imstkNew<Sphere>          visualGeom(Vec3d(0.0, 0.0, 0.0), 20.0);
diff --git a/Source/Devices/imstkDeviceClient.h b/Source/Devices/imstkDeviceClient.h
index a4abc218b631f9a1828bb1c71f4f5164ca2e1361..964c091dbad9b2241366df8e1b3b073983a78496 100644
--- a/Source/Devices/imstkDeviceClient.h
+++ b/Source/Devices/imstkDeviceClient.h
@@ -54,7 +54,7 @@ public:
 
 public:
     ButtonStateType m_buttonState;
-    const int m_button = -1;
+    const int       m_button = -1;
 };
 
 ///
diff --git a/Source/Devices/imstkHapticDeviceClient.cpp b/Source/Devices/imstkHapticDeviceClient.cpp
index aaee2ebccd18dd5af3d0314acb6aca8e9c476217..06bf0992859326e65ea80e3174c60dcf2ed1524c 100644
--- a/Source/Devices/imstkHapticDeviceClient.cpp
+++ b/Source/Devices/imstkHapticDeviceClient.cpp
@@ -110,7 +110,7 @@ HapticDeviceClient::hapticCallback(void* pData)
     client->m_position << state.pos[0], state.pos[1], state.pos[2];
     client->m_velocity << state.vel[0], state.vel[1], state.vel[2];
     client->m_orientation = (Eigen::Affine3d(Eigen::Matrix4d(state.trans))).rotation();
-    
+
     for (int i = 0; i < 4; i++)
     {
         // If button down and not previously down