[MOD] Minor refactorings.