small refactorings to help our collective memories
small refactorings