DDBEXTRA-186: refactoring after review