preparing queue to refactor