[#210] Refactoring.