more rewrite edits