clean-up following review
minor edits from review