Simplify the queue class