Refactor hardware buffers