issue-1963 - minor refactoring