Queue micro refactoring