rename and clean up of html