Made all but 1 change requested by Ian.
1 file changed