Refactoring custom delimiter, added method to extract delimiters