Fixed a minor bug
Better delimiters