Make the html template cleaner