Refactor ItemsList