* final refactorings