Better removal of special characters