Use the uppercase always, get rid of string cases comparison