CDITCK-379 Minor updates
- simplify delay adjustment
- share the logic to obtain a configuration property value