Code cleanup for item.shelve based on 8/22 code review