Updating: minorly very tidying-up