Changes uppercase check to be more concise