Merge "No-op refactor of Items class"