html templating clean-up