Fixed suggestions from reviewer