[#805] minor refactorings