Fix mismatched delimiters

Fix mismatched delimiters & switch to shortest possible delimiter length