Good advice.
That's the process I use and I get top reviews for cleanliness from my strap-on Dommes.