Refactored #delimiter