Included some input sanitation