Further HTML cleanup