Code cleanup, overcomplicated /name, supports data values and custom item names