minor edits, whitespace