auditing: minor reorganization.