cleaned code
.
add test unit part for subqueue