BZ-9171: Cleaned up templating

Signed-off-by: Paden <padenportillo@gmail.com>