Cleanup, minor edits.