diff --git a/Source/Core/VideoCommon/VertexLoader_Normal.cpp b/Source/Core/VideoCommon/VertexLoader_Normal.cpp
index 06b80c10f3..129ca85036 100644
--- a/Source/Core/VideoCommon/VertexLoader_Normal.cpp
+++ b/Source/Core/VideoCommon/VertexLoader_Normal.cpp
@@ -176,15 +176,12 @@ void VertexLoader_Normal::Init()
   m_Table[NRM_INDEX16][NRM_INDICES3][NRM_NBT3][FORMAT_FLOAT] = Normal_Index_Indices3<u16, float>();
 }
 
-unsigned int VertexLoader_Normal::GetSize(u64 _type, unsigned int _format, unsigned int _elements,
-                                          unsigned int _index3)
+u32 VertexLoader_Normal::GetSize(u64 type, u32 format, u32 elements, u32 index3)
 {
-  return m_Table[_type][_index3][_elements][_format].gc_size;
+  return m_Table[type][index3][elements][format].gc_size;
 }
 
-TPipelineFunction VertexLoader_Normal::GetFunction(u64 _type, unsigned int _format,
-                                                   unsigned int _elements, unsigned int _index3)
+TPipelineFunction VertexLoader_Normal::GetFunction(u64 type, u32 format, u32 elements, u32 index3)
 {
-  TPipelineFunction pFunc = m_Table[_type][_index3][_elements][_format].function;
-  return pFunc;
+  return m_Table[type][index3][elements][format].function;
 }
diff --git a/Source/Core/VideoCommon/VertexLoader_Normal.h b/Source/Core/VideoCommon/VertexLoader_Normal.h
index 5b91615761..b194e3cb8d 100644
--- a/Source/Core/VideoCommon/VertexLoader_Normal.h
+++ b/Source/Core/VideoCommon/VertexLoader_Normal.h
@@ -10,16 +10,11 @@
 class VertexLoader_Normal
 {
 public:
-  // Init
   static void Init();
 
-  // GetSize
-  static unsigned int GetSize(u64 _type, unsigned int _format, unsigned int _elements,
-                              unsigned int _index3);
+  static u32 GetSize(u64 type, u32 format, u32 elements, u32 index3);
 
-  // GetFunction
-  static TPipelineFunction GetFunction(u64 _type, unsigned int _format, unsigned int _elements,
-                                       unsigned int _index3);
+  static TPipelineFunction GetFunction(u64 type, u32 format, u32 elements, u32 index3);
 
 private:
   enum ENormalType