Further trimming and edits