Simplify template partials
Simplify template partials