VP-243 Minor refactoring