more snippet cleaning