Updating: tidying up some code.