Minor edits based on David's suggestions