Refactored so that delimiters are in a single array