DOCS-454 refactor