Added user input sanitation