Slight modifiction to clean up but no change of behavior