Minor edits/cleanup.