Fix node order
Handle whitespace between args