Code cleanup. Refactor how items work