Cleaned up packed item usage code