Cleanup code
Converter now uses delimiter argument if provided