minor edits per TC feedback