Tidying up in ModItems