Refactor benchmark