CLC-3682 Tweak code layout and privacy