[#5] small refactoring.