removed unused '|| upcase' lines