Clean Code with Queue bug removed