Phrasing and linkage cleanup