cleaned up question package