Added sanitation throughout