fixing the queue print and started cleaning up attributes