delimiter refactored