Remaking clean to be case insensitive