Style adjustments. Helper updates