Improving C section following feedback from @pdewacht and HN comments.