Misc cleanup
Much improved method for masking glowplug