Sam - did some sanitizations