Tidied up the item classes.