Few style fixes + avoid unneeded copies