[#805] More refactorings