Improve benchmark scripts