Updating: tidying-up code