Cleaning up edits from Jim.