Refactor micro-queue