(Overlay Analog) Coding style fixes