Some refactorizations