Small changes to the delimiter token
Removed the delimiter from some constructors
Removed more delimiters from constructors
No more useless delimiter objects
Method renaming