small trimming and textual edits