Updating: tidying up some FALCON code