Remove substring copies

Still, char array stealing would be better
Format