Tidy up, case insensitive