code improvement

this is a bit faster (from ~500ns (without ",") to ~250ns, ~750ns to 400ns (with ",")) and a lot cleaner for me.