Edits and cleanup.