diff --git a/include/RAJA/pattern/params/forall.hpp b/include/RAJA/pattern/params/forall.hpp
index a10a0c20ef..623d6f48b1 100644
--- a/include/RAJA/pattern/params/forall.hpp
+++ b/include/RAJA/pattern/params/forall.hpp
@@ -193,16 +193,15 @@ namespace expt
   //===========================================================================
   //
   //
-  // kernel_name should be the second to last argument in the param pack, just extract it...
+  // kernel_name is expected to be the second to last argument, just extract it
   //
-  //TODO fix this up, should be able to walk through the parameter pack to find the KernelName
-  //If none is found we need to provide a substitute
   //
   template<typename... Args, typename std::enable_if<sizeof...(Args) >= 2, bool>::type = true>
   constexpr auto&& get_kernel_name(Args&&... args){
     return camp::get<sizeof...(Args)-2>( camp::forward_as_tuple(std::forward<Args>(args)...) );
   }
 
+
   template<typename... Args, typename std::enable_if<sizeof...(Args) < 2, bool>::type = true>
   constexpr auto&& get_kernel_name(Args&&... args){
     return camp::get<0>( camp::forward_as_tuple(std::forward<Args>(args)...) );