Clean up html wrapping