Cleanup range bench a bit