Sanitize input
Better input handling