Jeremy Newman : clean up HTML