Final(?) improvement for HTML code gen