Refactor and ignore case