cleanups, comments. No behavioral changes.