Tidied up delimiters