diff --git a/examples/41-tess/constants.h b/examples/41-tess/constants.h
deleted file mode 100644
index 3ce751479..000000000
--- a/examples/41-tess/constants.h
+++ /dev/null
@@ -1,209 +0,0 @@
-#pragma once
-
-#include "common.h"
-
-
-const char* shader_options[] = {
-	"Normal",
-	"Diffuse"
-};
-
-////Instanced patch geometry at various subdiv levels////
-
-//gpuSubd == 0
-const float verticesL0[] = {
-    0.0f, 0.0f,
-    1.0f, 0.0f,
-    0.0f, 1.0f
-};
-
-const uint32_t indexesL0[] = { 0u, 1u, 2u };
-
-//gpuSubd == 1
-const float verticesL1[] = {
-    0.0f, 1.0f,
-    0.5f, 0.5f,
-    0.0f, 0.5f,
-    0.0f, 0.0f,
-    0.5f, 0.0f,
-    1.0f, 0.0f
-};
-const uint32_t indexesL1[] = {
-    1u, 0u, 2u,
-    1u, 2u, 3u,
-    1u, 3u, 4u,
-    1u, 4u, 5u
-};
-
-//gpuSubd == 2
-const float verticesL2[] = {
-    0.25f, 0.75f,
-    0.0f, 1.0f,
-    0.0f, 0.75f,
-    0.0f, 0.5f,
-    0.25f, 0.5f,
-    0.5f, 0.5f,
-
-    0.25f, 0.25f,
-    0.0f, 0.25f,
-    0.0f, 0.0f,
-    0.25f, 0.0f,
-    0.5f, 0.0f,
-    0.5f, 0.25f,
-    0.75f, 0.25f,
-    0.75f, 0.0f,
-    1.0f, 0.0f        //14
-};
-const uint32_t indexesL2[] = {
-    0u, 1u, 2u,
-    0u, 2u, 3u,
-    0u, 3u, 4u,
-    0u, 4u, 5u,
-
-    6u, 5u, 4u,
-    6u, 4u, 3u,
-    6u, 3u, 7u,
-    6u, 7u, 8u,
-
-    6u, 8u, 9u,
-    6u, 9u, 10u,
-    6u, 10u, 11u,
-    6u, 11u, 5u,
-
-    12u, 5u, 11u,
-    12u, 11u, 10u,
-    12u, 10u, 13u,
-    12u, 13u, 14u
-};
-
-//gpuSubd == 3
-const float verticesL3[] = {
-    0.25f*0.5f, 0.75f*0.5f + 0.5f,
-    0.0f*0.5f, 1.0f*0.5f + 0.5f,
-    0.0f*0.5f, 0.75f*0.5f + 0.5f,
-    0.0f*0.5f , 0.5f*0.5f + 0.5f,
-    0.25f*0.5f, 0.5f*0.5f + 0.5f,
-    0.5f*0.5f, 0.5f*0.5f + 0.5f,
-    0.25f*0.5f, 0.25f*0.5f + 0.5f,
-    0.0f*0.5f, 0.25f*0.5f + 0.5f,
-    0.0f*0.5f, 0.0f*0.5f + 0.5f,
-    0.25f*0.5f, 0.0f*0.5f + 0.5f,
-    0.5f*0.5f, 0.0f*0.5f + 0.5f,
-    0.5f*0.5f, 0.25f*0.5f + 0.5f,
-    0.75f*0.5f, 0.25f*0.5f + 0.5f,
-    0.75f*0.5f, 0.0f*0.5f + 0.5f,
-    1.0f*0.5f, 0.0f*0.5f + 0.5f,        //14
-
-    0.375f, 0.375f,
-    0.25f, 0.375f,
-    0.25f, 0.25f,
-    0.375f, 0.25f,
-    0.5f, 0.25f,
-    0.5f, 0.375f,    //20
-
-    0.125f, 0.375f,
-    0.0f, 0.375f,
-    0.0f, 0.25f,
-    0.125f, 0.25f,    //24
-
-    0.125f, 0.125f,
-    0.0f, 0.125f,
-    0.0f, 0.0f,
-    0.125f, 0.0f,
-    0.25f, 0.0f,
-    0.25f, 0.125f,    //30
-
-    0.375f, 0.125f,
-    0.375f, 0.0f,
-    0.5f, 0.0f,
-    0.5f, 0.125f,    //34
-
-    0.625f, 0.375f,
-    0.625f, 0.25f,
-    0.75f, 0.25f,    //37
-
-    0.625f, 0.125f,
-    0.625f, 0.0f,
-    0.75f, 0.0f,
-    0.75f, 0.125f,    //41
-
-    0.875f, 0.125f,
-    0.875f, 0.0f,
-    1.0f, 0.0f    //44
-};
-const uint32_t indexesL3[] = {
-    0u, 1u, 2u,
-    0u, 2u, 3u,
-    0u, 3u, 4u,
-    0u, 4u, 5u,
-
-    6u, 5u, 4u,
-    6u, 4u, 3u,
-    6u, 3u, 7u,
-    6u, 7u, 8u,
-
-    6u, 8u, 9u,
-    6u, 9u, 10u,
-    6u, 10u, 11u,
-    6u, 11u, 5u,
-
-    12u, 5u, 11u,
-    12u, 11u, 10u,
-    12u, 10u, 13u,
-    12u, 13u, 14u,        //End fo first big triangle
-
-    15u, 14u, 13u,
-    15u, 13u, 10u,
-    15u, 10u, 16u,
-    15u, 16u, 17u,
-    15u, 17u, 18u,
-    15u, 18u, 19u,
-    15u, 19u, 20u,
-    15u, 20u, 14u,
-
-    21u, 10u, 9u,
-    21u, 9u, 8u,
-    21u, 8u, 22u,
-    21u, 22u, 23u,
-    21u, 23u, 24u,
-    21u, 24u, 17u,
-    21u, 17u, 16u,
-    21u, 16u, 10u,
-
-    25u, 17u, 24u,
-    25u, 24u, 23u,
-    25u, 23u, 26u,
-    25u, 26u, 27u,
-    25u, 27u, 28u,
-    25u, 28u, 29u,
-    25u, 29u, 30u,
-    25u, 30u, 17u,
-
-    31u, 19u, 18u,
-    31u, 18u, 17u,
-    31u, 17u, 30u,
-    31u, 30u, 29u,
-    31u, 29u, 32u,
-    31u, 32u, 33u,
-    31u, 33u, 34u,
-    31u, 34u, 19u,
-
-    35u, 14u, 20u,
-    35u, 20u, 19u,
-    35u, 19u, 36u,
-    35u, 36u, 37u,
-
-    38u, 37u, 36u,
-    38u, 36u, 19u,
-    38u, 19u, 34u,
-    38u, 34u, 33u,
-    38u, 33u, 39u,
-    38u, 39u, 40u,
-    38u, 40u, 41u,
-    38u, 41u, 37u,
-
-    42u, 37u, 41u,
-    42u, 41u, 40u,
-    42u, 40u, 43u,
-    42u, 43u, 44u
-};
diff --git a/examples/41-tess/tess.cpp b/examples/41-tess/tess.cpp
index 937d7028b..5ed19d024 100644
--- a/examples/41-tess/tess.cpp
+++ b/examples/41-tess/tess.cpp
@@ -20,11 +20,220 @@
 #include "bounds.h"
 #include "camera.h"
 #include "common.h"
-#include "constants.h"
 #include "imgui/imgui.h"
 
 namespace
 {
+	static const char* s_shaderOptions[] =
+	{
+		"Normal",
+		"Diffuse"
+	};
+
+	static const float s_verticesL0[] =
+	{
+		0.0f, 0.0f,
+		1.0f, 0.0f,
+		0.0f, 1.0f,
+	};
+
+	static const uint32_t s_indexesL0[] = { 0u, 1u, 2u };
+
+	static const float s_verticesL1[] =
+	{
+		0.0f, 1.0f,
+		0.5f, 0.5f,
+		0.0f, 0.5f,
+		0.0f, 0.0f,
+		0.5f, 0.0f,
+		1.0f, 0.0f,
+	};
+
+	static const uint32_t s_indexesL1[] =
+	{
+		1u, 0u, 2u,
+		1u, 2u, 3u,
+		1u, 3u, 4u,
+		1u, 4u, 5u,
+	};
+
+	static const float s_verticesL2[] =
+	{
+		0.25f, 0.75f,
+		0.0f,  1.0f,
+		0.0f,  0.75f,
+		0.0f,  0.5f,
+		0.25f, 0.5f,
+		0.5f,  0.5f,
+
+		0.25f, 0.25f,
+		0.0f,  0.25f,
+		0.0f,  0.0f,
+		0.25f, 0.0f,
+		0.5f,  0.0f,
+		0.5f,  0.25f,
+		0.75f, 0.25f,
+		0.75f, 0.0f,
+		1.0f,  0.0f,
+	};
+
+	static const uint32_t s_indexesL2[] =
+	{
+		0u, 1u, 2u,
+		0u, 2u, 3u,
+		0u, 3u, 4u,
+		0u, 4u, 5u,
+
+		6u, 5u, 4u,
+		6u, 4u, 3u,
+		6u, 3u, 7u,
+		6u, 7u, 8u,
+
+		6u, 8u, 9u,
+		6u, 9u, 10u,
+		6u, 10u, 11u,
+		6u, 11u, 5u,
+
+		12u, 5u, 11u,
+		12u, 11u, 10u,
+		12u, 10u, 13u,
+		12u, 13u, 14u,
+	};
+
+	static const float s_verticesL3[] =
+	{
+		0.25f*0.5f, 0.75f*0.5f + 0.5f,
+		0.0f*0.5f, 1.0f*0.5f + 0.5f,
+		0.0f*0.5f, 0.75f*0.5f + 0.5f,
+		0.0f*0.5f , 0.5f*0.5f + 0.5f,
+		0.25f*0.5f, 0.5f*0.5f + 0.5f,
+		0.5f*0.5f, 0.5f*0.5f + 0.5f,
+		0.25f*0.5f, 0.25f*0.5f + 0.5f,
+		0.0f*0.5f, 0.25f*0.5f + 0.5f,
+		0.0f*0.5f, 0.0f*0.5f + 0.5f,
+		0.25f*0.5f, 0.0f*0.5f + 0.5f,
+		0.5f*0.5f, 0.0f*0.5f + 0.5f,
+		0.5f*0.5f, 0.25f*0.5f + 0.5f,
+		0.75f*0.5f, 0.25f*0.5f + 0.5f,
+		0.75f*0.5f, 0.0f*0.5f + 0.5f,
+		1.0f*0.5f, 0.0f*0.5f + 0.5f,        //14
+
+		0.375f, 0.375f,
+		0.25f, 0.375f,
+		0.25f, 0.25f,
+		0.375f, 0.25f,
+		0.5f, 0.25f,
+		0.5f, 0.375f,    //20
+
+		0.125f, 0.375f,
+		0.0f, 0.375f,
+		0.0f, 0.25f,
+		0.125f, 0.25f,    //24
+
+		0.125f, 0.125f,
+		0.0f, 0.125f,
+		0.0f, 0.0f,
+		0.125f, 0.0f,
+		0.25f, 0.0f,
+		0.25f, 0.125f,    //30
+
+		0.375f, 0.125f,
+		0.375f, 0.0f,
+		0.5f, 0.0f,
+		0.5f, 0.125f,    //34
+
+		0.625f, 0.375f,
+		0.625f, 0.25f,
+		0.75f, 0.25f,    //37
+
+		0.625f, 0.125f,
+		0.625f, 0.0f,
+		0.75f, 0.0f,
+		0.75f, 0.125f,    //41
+
+		0.875f, 0.125f,
+		0.875f, 0.0f,
+		1.0f, 0.0f,    //44
+	};
+
+	static const uint32_t s_indexesL3[] =
+	{
+		0u, 1u, 2u,
+		0u, 2u, 3u,
+		0u, 3u, 4u,
+		0u, 4u, 5u,
+
+		6u, 5u, 4u,
+		6u, 4u, 3u,
+		6u, 3u, 7u,
+		6u, 7u, 8u,
+
+		6u, 8u, 9u,
+		6u, 9u, 10u,
+		6u, 10u, 11u,
+		6u, 11u, 5u,
+
+		12u, 5u, 11u,
+		12u, 11u, 10u,
+		12u, 10u, 13u,
+		12u, 13u, 14u,        //End fo first big triangle
+
+		15u, 14u, 13u,
+		15u, 13u, 10u,
+		15u, 10u, 16u,
+		15u, 16u, 17u,
+		15u, 17u, 18u,
+		15u, 18u, 19u,
+		15u, 19u, 20u,
+		15u, 20u, 14u,
+
+		21u, 10u, 9u,
+		21u, 9u, 8u,
+		21u, 8u, 22u,
+		21u, 22u, 23u,
+		21u, 23u, 24u,
+		21u, 24u, 17u,
+		21u, 17u, 16u,
+		21u, 16u, 10u,
+
+		25u, 17u, 24u,
+		25u, 24u, 23u,
+		25u, 23u, 26u,
+		25u, 26u, 27u,
+		25u, 27u, 28u,
+		25u, 28u, 29u,
+		25u, 29u, 30u,
+		25u, 30u, 17u,
+
+		31u, 19u, 18u,
+		31u, 18u, 17u,
+		31u, 17u, 30u,
+		31u, 30u, 29u,
+		31u, 29u, 32u,
+		31u, 32u, 33u,
+		31u, 33u, 34u,
+		31u, 34u, 19u,
+
+		35u, 14u, 20u,
+		35u, 20u, 19u,
+		35u, 19u, 36u,
+		35u, 36u, 37u,
+
+		38u, 37u, 36u,
+		38u, 36u, 19u,
+		38u, 19u, 34u,
+		38u, 34u, 33u,
+		38u, 33u, 39u,
+		38u, 39u, 40u,
+		38u, 40u, 41u,
+		38u, 41u, 37u,
+
+		42u, 37u, 41u,
+		42u, 41u, 40u,
+		42u, 40u, 43u,
+		42u, 43u, 44u,
+	};
+
 	enum
 	{
 		PROGRAM_TERRAIN_NORMAL,
@@ -306,7 +515,7 @@ namespace
 					m_uniforms.gpuSubd = (float)gpuSlider;
 				}
 
-				ImGui::Combo("Shading", &m_shading, shader_options, 2);
+				ImGui::Combo("Shading", &m_shading, s_shaderOptions, 2);
 
 				ImGui::Text("Some variables require rebuilding the subdivide buffers and causes a stutter.");
 
@@ -587,43 +796,41 @@ namespace
 			const float* vertices;
 			const uint32_t* indexes;
 
-			if (m_uniforms.gpuSubd == 0) {
-
+			switch (int32_t(m_uniforms.gpuSubd) )
+			{
+			case 0:
 				m_instancedMeshVertexCount = 3;
 				m_instancedMeshPrimitiveCount = 1;
+				vertices = s_verticesL0;
+				indexes  = s_indexesL0;
+				break;
 
-				vertices = verticesL0;
-				indexes = indexesL0;
-			}
-
-			else if (m_uniforms.gpuSubd == 1) {
+			case 1:
 				m_instancedMeshVertexCount = 6;
 				m_instancedMeshPrimitiveCount = 4;
+				vertices = s_verticesL1;
+				indexes  = s_indexesL1;
+				break;
 
-				vertices = verticesL1;
-				indexes = indexesL1;
-			}
-
-			else if (m_uniforms.gpuSubd == 2) {
+			case 2:
 				m_instancedMeshVertexCount = 15;
 				m_instancedMeshPrimitiveCount = 16;
+				vertices = s_verticesL2;
+				indexes  = s_indexesL2;
+				break;
 
-				vertices = verticesL2;
-				indexes = indexesL2;
-			}
-
-			else { //(m_settings.gpuSubd == 3) {
+			default:
 				m_instancedMeshVertexCount = 45;
 				m_instancedMeshPrimitiveCount = 64;
-
-				vertices = verticesL3;
-				indexes = indexesL3;
+				vertices = s_verticesL3;
+				indexes  = s_indexesL3;
+				break;
 			}
 
 			m_instancedGeometryDecl.begin().add(bgfx::Attrib::TexCoord0, 2, bgfx::AttribType::Float).end();
 
 			m_instancedGeometryVertices = bgfx::createVertexBuffer(bgfx::makeRef(vertices, sizeof(float) * 2 * m_instancedMeshVertexCount), m_instancedGeometryDecl);
-			m_instancedGeometryIndices = bgfx::createIndexBuffer(bgfx::makeRef(indexes, sizeof(uint32_t) * m_instancedMeshPrimitiveCount * 3), BGFX_BUFFER_INDEX32);
+			m_instancedGeometryIndices  = bgfx::createIndexBuffer(bgfx::makeRef(indexes, sizeof(uint32_t) * m_instancedMeshPrimitiveCount * 3), BGFX_BUFFER_INDEX32);
 		}
 
 		Uniforms m_uniforms;