Small refactorisation