Clean up some markup