Incorporate @gjtorikian's suggested edits