Longer delimiters allowed
Refactoring code