Cleanup and further abstract Audio Queues