LPS-37352 - Close regex block, remove redundant char checks