Add highlight to writing and clean up