DELTASPIKE-465 minor refactoring