Additional refactor to #delimiter