minor edits for consistency, readability