A small refactoring.
The first run amendments.