[OE-3743] Minor style tweaks