Address Review Comments

most from @PrometheusPi
Do Not Use Template Param T Directly

Thx @psychocoderHPC