Small refactorization