Var name cleanup
Do html templates in a simpler way