Refactor open_buffers() pt2