Minor refactor
Change code so it is case insensitive