case 3298 - Small refactoring according to CR