Fixing code review, and improving benchmark