Tidying up in Item.java