refactor reorder buffer