refactoring: take advantage of a previous refactorization