Updating: tidying-up a bit