Cleanup, update, and simplify text where possible