Implemented OpenSingles algorithm refactoring
Added support for other delimiters
Some cleanups