ref #7439 Code refactoring