Added input clensing