Initial cleanup and fix of x/y labels and units

[#57921064]

I've also removed some unnecessary closure variables from SVG container.