Updating: minorly tidying-up