While there was a certain amount of improvisation--he originally intended to leave her breasts their original size, for example--the broad strokes were planned, yes.

He grins when he finally gets a reaction from her, dumping holy water on her next to make sure it gets into each and every mark left on her by the whip.