CON-999: small code refactor