quick refactorisation