[#009] One tiny refactoring