small refactorings of the code base in order to prepare developments for other consolidation points loading