updated from score to item, and cleanup