Removed unnecessary upper() and lower() stuff.