Use template factory instead of inline creation
Exclude Templates from reviewer controller