[#818] Refactorings