Minor cleaning plus a new benchmarking utility