Fixed suggestions made by Kevin