Editing and cleanup.