Change Queue to return just the data and fix hunter.c correspondingly