comment and html template cleanup