Final polishing edits