Small edits and cleanup.