Slightly refactored benchmarking, comments