CLN: cleanup + edits - addresses recent discussion