minor
Refactoring of the utilities