Similar refactor to item code