Fixed suggestions from comments