[DDC-2256] Code improvements.