finisher refactoring, well, more or less