Further clean up of the passing of strings