@SirCumference Double barlines seems to be the convention, you're doing good in both instances (when changing and when returning). When changing to lesser flats / sharps, sometimes the engraver would put natural signs such as in the Chopin Waltz below. But personally, I prefer without (less things to read).