Add case conversion and whitespace trimming