[#855] Refactoring