[#247] small refactoring