Clean up html echoing