Item Automation for Shield, code cleanup