[#330] small refactoring