diff --git a/3d-viewer/3d_canvas/board_adapter.cpp b/3d-viewer/3d_canvas/board_adapter.cpp
index 7f59629f33..628099e529 100644
--- a/3d-viewer/3d_canvas/board_adapter.cpp
+++ b/3d-viewer/3d_canvas/board_adapter.cpp
@@ -505,7 +505,6 @@ void BOARD_ADAPTER::InitSettings( REPORTER* aStatusReporter, REPORTER* aWarningR
             zposTop    = zposBottom + m_nonCopperLayerThickness3DU;
             break;
 
-        // !TODO: review
         default:
             zposTop = zpos_copperTop_front + (layer_id - MAX_CU_LAYERS + 3.0f) * zpos_offset;
             zposBottom = zposTop - m_nonCopperLayerThickness3DU;
diff --git a/3d-viewer/3d_canvas/eda_3d_canvas.cpp b/3d-viewer/3d_canvas/eda_3d_canvas.cpp
index d719793beb..c157a7752e 100644
--- a/3d-viewer/3d_canvas/eda_3d_canvas.cpp
+++ b/3d-viewer/3d_canvas/eda_3d_canvas.cpp
@@ -366,13 +366,10 @@ void EDA_3D_CANVAS::DoRePaint()
     if( !GetParent()->GetParent()->IsShownOnScreen() )
         return; // The parent board editor frame is no more alive
 
-    wxString err_messages;
-
-    // !TODO: implement error reporter
+    wxString           err_messages;
     INFOBAR_REPORTER   warningReporter( m_parentInfoBar );
     STATUSBAR_REPORTER activityReporter( m_parentStatusBar, EDA_3D_VIEWER_STATUSBAR::ACTIVITY );
-
-    unsigned strtime = GetRunningMicroSecs();
+    unsigned           start_time = GetRunningMicroSecs();
 
     // "Makes the OpenGL state that is represented by the OpenGL rendering
     //  context context current, i.e. it will be used by all subsequent OpenGL calls.
@@ -548,7 +545,7 @@ void EDA_3D_CANVAS::DoRePaint()
     if( m_mouse_was_moved || m_camera_is_moving )
     {
         // Calculation time in milliseconds
-        const double calculation_time = (double)( GetRunningMicroSecs() - strtime) / 1e3;
+        const double calculation_time = (double)( GetRunningMicroSecs() - start_time ) / 1e3;
 
         activityReporter.Report( wxString::Format( _( "Last render time %.0f ms" ),
                                  calculation_time ) );
diff --git a/3d-viewer/3d_rendering/raytracing/accelerators/bvh_pbrt.cpp b/3d-viewer/3d_rendering/raytracing/accelerators/bvh_pbrt.cpp
index c02e0a145e..0c6512a7c6 100644
--- a/3d-viewer/3d_rendering/raytracing/accelerators/bvh_pbrt.cpp
+++ b/3d-viewer/3d_rendering/raytracing/accelerators/bvh_pbrt.cpp
@@ -437,7 +437,7 @@ BVHBuildNode *BVH_PBRT::recursiveBuild ( std::vector<BVHPrimitiveInfo>& primitiv
 
     (*totalNodes)++;
 
-    // !TODO: implement an memory Arena
+    // !TODO: implement a memory arena
     BVHBuildNode *node = static_cast<BVHBuildNode *>( malloc( sizeof( BVHBuildNode ) ) );
     m_nodesToFree.push_back( node );