Item refactor