Added auto itemName by ID & cleared the code a bit