It looks like I've been doing it right. It probably doesn't make much difference, but there's only one right way.

Thanks to everybody that responded!