PMO-2287: minor refactoring necessary