Refactored benchmark